aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9159 from lexmag/col_defaults-dup-fixCarlos Antonio da Silva2013-02-034-2/+16
|\ | | | | Backport: Duplicate column_defaults properly
| * This pull requests addresses ORA-01400 errors and also supports #6115 issue ↵Yasuo Honda2013-02-031-1/+1
| | | | | | | | | | | | | | | | | | 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.
| * Duplicate column_defaults properlyPiotr Sarnacki2013-02-034-2/+16
|/ | | | | | | | | | Backport c517602 to fix #6115 Deleted: activerecord/lib/active_record/core.rb Conflicts: activerecord/test/cases/base_test.rb
* Merge pull request #9078 from senny/6865_ar_count_with_uniqRafael Mendonça França2013-02-023-1/+15
| | | | | | `#count` in conjunction with `#uniq` performs distinct count. Conflicts: activerecord/CHANGELOG.md
* Fix markdown syntax in actionpack CHANGELOG.Steve Klabnik2013-02-011-1/+2
| | | | Starting a line with an octothorpe makes an <h1>
* Merge pull request #9043 from senny/backport_7536Carlos Antonio da Silva2013-01-295-3/+23
|\ | | | | Backport: Fix pluck when columns/tables are reserved words.
| * Fix pluck when columns/tables are reserved words.Ian Lesperance2013-01-235-3/+23
| | | | | | | | | | | | | | | | | | Backport #7536 to fix #8968. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb
* | Merge pull request #9114 from rosenfeld/patch-2Rafael Mendonça França2013-01-291-0/+1
|\ \ | | | | | | Add another NumberHelper missing dependency
| * | Add another NumberHelper missing dependencyRodrigo Rosenfeld Rosas2013-01-291-0/+1
|/ / | | | | | | | | Another missing dependency, now affecting #number_to_percentage. It depends on reverse_merge.
* | Merge pull request #9113 from rosenfeld/patch-1Rafael Mendonça França2013-01-291-0/+1
|\ \ | | | | | | Add NumberHelper missing dependency
| * | Add NumberHelper missing dependencyRodrigo Rosenfeld Rosas2013-01-291-0/+1
|/ / | | | | symbolize_keys depends on hash/keys AS core extension
* | Install latest bundler on Travis.José Valim2013-01-261-0/+2
| | | | | | | | | | | | | | | | | | | | 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.
* | Fix the CHANGELOG entry order [ci skip]Rafael Mendonça França2013-01-251-3/+5
| |
* | Merge pull request #9074 from ↵Carlos Antonio da Silva2013-01-251-3/+3
|\ \ | |/ |/| | | | | gaynetdinov/replace_undefined_abcs_to_config_variable Undefined abcs variable inside structure:dump task.
| * Replaced abcs to config.Damir Gaynetdinov2013-01-251-3/+3
|/
* Add changelog entry for skipping explain from dbs that don't support itCarlos Antonio da Silva2013-01-221-0/+5
| | | | Backport of #6197 in 29d564add926307fea8cd3f77caf88d735e252a1.
* Merge pull request #6197 from ↵Xavier Noria2013-01-223-6/+24
| | | | | | blakesmith/connection_adapters_without_explain_support Don't run explain on slow queries for database adapters that don't support it
* Revert "Merge pull request #6986 from kennyj/fix_6975"Andrew White2013-01-223-29/+10
| | | | | | | | | This reverts commit 8905c1fb496641c3cdb7b3b816ae6d3d4b2c2b73. Closes #8460 Conflicts: activerecord/test/cases/dirty_test.rb
* Add failing test case for #8460Andrew White2013-01-221-0/+14
| | | | Add a test case to ensure that fractional second updates are detected.
* Duplicate possible frozen string from routeAndrew White2013-01-212-2/+10
| | | | | | | | | | | | | 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
* Remove warning of not used variableCarlos Antonio da Silva2013-01-171-1/+1
|
* Do not run this streaming test in Ruby 1.8, fix syntax errorCarlos Antonio da Silva2013-01-171-5/+8
|
* Merge pull request #5288 from lest/patch-2José Valim2013-01-173-0/+21
| | | | | | force response body to be read in assert_template Conflicts: actionpack/lib/action_controller/test_case.rb
* Merge pull request #8632 from asanghi/3-2-stableAndrew White2013-01-163-1/+32
|\ | | | | Fixes #8631 request post? detection should remain unaffected by local inflections such as POS for Point Of Sale
| * fixes #8631 local inflections from interfereing with HTTP_METHOD_LOOKUP ↵Aditya Sanghi2013-01-163-1/+32
|/ | | | dispatch logic
* Merge pull request #8933 from freerange/3-2-stable-with-minitest-fixRafael Mendonça França2013-01-151-1/+1
|\ | | | | Make tests for the presence of MiniTest consistent
| * Make tests for the presence of MiniTest consistent.James Mead2013-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge pull request #8914 from nilbus/fix-header-bloatRafael Mendonça França2013-01-153-2/+10
| | | | | | | | | | | | Remove header bloat introduced by BestStandardsSupport middleware Conflicts: actionpack/CHANGELOG.md
* | Merge branch 'revert-binds-3-2' into 3-2-stableCarlos Antonio da Silva2013-01-158-49/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | 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.
| * | Revert "Work around undiagnosed bug that's draining a relation's bind_values"Carlos Antonio da Silva2013-01-151-1/+0
| | | | | | | | | | | | This reverts commit 06cc38a2b0d4778746e8a2a2e2b6aa07e1c1c075.
| * | Revert "Merge pull request #7983 from georgebrock/bug7950-squashed"Carlos Antonio da Silva2013-01-158-48/+12
|/ / | | | | | | | | | | | | | | | | | | | | 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.
* | Fix the TestCase class and make tests pass on ruby 2.0Rafael Mendonça França2013-01-141-2/+2
| |
* | Add regression test to #8907Rafael Mendonça França2013-01-141-0/+31
|/
* Merge pull request #8927 from dkubb/issue-8178Rafael Mendonça França2013-01-143-1/+10
|\ | | | | Fix DateTime comparison with DateTime::Infinity object
| * Test to allow Range including DateTime and DateTime::Infinitygsphanikumar2013-01-131-0/+6
| | | | | | | | Closes #8587
| * Fix DateTime comparison with DateTime::Infinity objectDan Kubb2013-01-132-1/+4
|/
* Merge pull request #8907 from rubys/masterRafael Mendonça França2013-01-121-1/+2
| | | | Fix regression introduced in pull 8812
* Remove unnecessary caching of ParameterFilterAndrew White2013-01-121-3/+1
|
* Merge pull request #8895 from ernie/revert-hmt-on-unsaved-in-3-2Rafael Mendonça França2013-01-113-19/+6
|\ | | | | Revert hm:t on unsaved collection for 3.2
| * Revert "Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmt"Ernie Miller2013-01-113-19/+6
|/ | | | | | | 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.
* Merge pull request #8888 from dylanahsmith/3-2-parse-non-object-json-paramsJeremy Kemper2013-01-103-2/+13
|\ | | | | 3-2-stable: Fix JSON params parsing regression for non-object JSON content.
| * Fix JSON params parsing regression for non-object JSON content.Dylan Smith2013-01-113-2/+13
|/ | | | Backports #8855.
* Reorder AP changelog and remove duplicated entry [ci skip]Carlos Antonio da Silva2013-01-101-11/+9
| | | | Duplicated entry added in 002dfba66490d289bac897d1ba886310a672e779.
* Merge pull request #8756 from causes/js_include_tag_fixGuillermo Iguaran2013-01-103-9/+28
|\ | | | | Fix javascript_include_tag when no js runtime is available
| * Fix javascript_include_tag when no js runtime is availableNoah Silas2013-01-073-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | Merge pull request #8735 from jejacks0n/duplicate_asset_fixGuillermo Iguaran2013-01-105-2/+16
|\ \ | | | | | | Ensure assets aren't duplicated when using sprockets require.
| * | Fixes issue where duplicate assets can be required with sprockets.jejacks0n2013-01-105-2/+16
|/ / | | | | | | | | - addresses the problem by calling flatten on asset array before calling uniq. - adds note to CHANGELOG.
* | Update changelogs with release date [ci skip]Carlos Antonio da Silva2013-01-097-9/+35
| |
* | Merge pull request #8838 from yahonda/8806_3-2-stableRafael Mendonça França2013-01-092-13/+27
|\ \ | | | | | | | | | Ignore binds payload with nil column in AR log subscriber
| * | Ignore binds payload with nil column in AR log subscriberYasuo Honda2013-01-092-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 08:09:55 +0000