aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8235 from tilsammans/dont_escape_actionmailer_when_plaintextJosé Valim2012-11-163-1/+27
| | | | | | | | Introduce `ActionView::Template::Handlers::ERB.escape_whitelist` Conflicts: actionpack/CHANGELOG.md actionpack/test/template/template_test.rb
* Merge pull request #8227 from senny/backport_8139Rafael Mendonça França2012-11-154-3/+18
|\ | | | | backport #8139, `plugin new` adds dummy app tasks when necessary
| * backport #8139, `plugin new` adds dummy app tasks when necessary. …Yves Senn2012-11-154-2/+17
| | | | | | | | | | | | | | | | | | | | | | The `plugin new` generator always adds the dummy app rake tasks, when a dummy app was created. Closes #8224 Conflicts: railties/CHANGELOG.md
| * Fixes issue #6251David Padilla2012-11-151-1/+1
|/ | | | | | | Plugin generator crashes when using the --dummy-path option Code was assuming the application name in `config/application.rb` was module Dummy.
* Merge pull request #8218 from DawidJanczak/form-tag-docCarlos Antonio da Silva2012-11-141-2/+2
|\ | | | | [ci skip] Correct examples for form_tag helper.
| * [ci skip] Correct examples for form_tag helper.DawidJanczak2012-11-141-2/+2
|/
* fix testJon Leighton2012-11-131-3/+3
| | | | | Conflicts: activerecord/test/cases/locking_test.rb
* Merge pull request #8209 from senny/backport_8176Rafael Mendonça França2012-11-133-1/+18
|\ | | | | | | | | | | | | backport #8176, `#pluck` can be used on a relation with `select` clause. Conflicts: activerecord/CHANGELOG.md
| * backport #8176, `#pluck` can be used on a relation with `select` clause.Yves Senn2012-11-133-1/+18
| | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb activerecord/test/cases/calculations_test.rb
* | Merge pull request #8204 from nikitug/fix_dynamic_finder_result_checkRafael Mendonça França2012-11-134-2/+21
|\ \ | | | | | | | | | | | | | | | | | | Use nil? instead of blank? to check dynamic finder result Conflicts: activerecord/CHANGELOG.md
| * | Use nil? instead of blank? to check dynamic finder resultNikita Afanasenko2012-11-134-1/+17
| | | | | | | | | | | | | | | | | | | | | 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
* | | Merge pull request #8188 from courtland/habtm-fix-stableCarlos Antonio da Silva2012-11-136-1/+31
|\ \ \ | |/ / |/| | Fix deleting from a HABTM join table upon destroying an object of a mode...
| * | Fix deleting from a HABTM join table upon destroying an object of a model ↵Nick Rogers2012-11-136-1/+31
|/ / | | | | | | with optimistic locking enabled. Fixes #5332.
* | Merge pull request #8205 from kennyj/fix_6951-32Rafael Mendonça França2012-11-133-6/+22
|\ \ | |/ |/| Backport #8074 to 3-2-stable. Use query cache/uncache, when using not only database.yml but also DATABASE_URL.
| * Backport #8074 to 3-2-stable. Use query cache/uncache, when using not only ↵kennyj2012-11-143-6/+22
|/ | | | database.yml but also DATABASE_URL.
* Revert "Use MiniTest in Ruby 1.8 if it is available."Carlos Antonio da Silva2012-11-132-8/+1
| | | | | | | 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.
* Fix warning with assigned but not used variableCarlos Antonio da Silva2012-11-131-3/+3
|
* Add changelog entry for #8200 [ci skip]Carlos Antonio da Silva2012-11-131-0/+7
|
* Update mocha version to 0.13.0 and change requiresCarlos Antonio da Silva2012-11-1311-12/+12
|
* Fix json encoding test with ruby 1.8.7 and random hash orderCarlos Antonio da Silva2012-11-131-1/+2
| | | | Introduced in 3e53fe6.
* Merge pull request #8200 from freerange/3-2-stable-with-mocha-fixesCarlos Antonio da Silva2012-11-133-5/+11
|\ | | | | Fix 3-2-stable to work with Mocha v0.13.0
| * Avoid a Mocha deprecation warning.James Mead2012-11-131-1/+1
| |
| * Fix for Test::Unit Mocha compatibility.James Mead2012-11-131-3/+5
| | | | | | | | | | | | | | | | 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.
| * Use MiniTest in Ruby 1.8 if it is available.James Mead2012-11-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Copy Mocha bug fix.James Mead2012-11-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge pull request #8199 from senny/backport_8182Carlos Antonio da Silva2012-11-133-1/+24
|\ \ | |/ |/| backport #8185, `#as_json` isolates options when encoding a hash.
| * backport #8185, `#as_json` isolates options when encoding a hash.Yves Senn2012-11-133-1/+24
|/ | | | | | | | | | 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
* Lock mocha in ~> 0.12.x until we fix the Ruby 1.8.7 issues with 0.13.0Carlos Antonio da Silva2012-11-121-1/+1
|
* Merge pull request #8193 from claudiob/add_rails329_release_dateRafael Mendonça França2012-11-127-7/+7
|\ | | | | Add release date of Rails 3.2.9 to documentation [ci skip]
| * Add release date of Rails 3.2.9 to documentationclaudiob2012-11-127-7/+7
|/
* Merge pull request #8154 from bogdan/has_one_association_performanceCarlos Antonio da Silva2012-11-123-1/+24
| | | | | | | Remove unwanted transaction when has one association is built Conflicts: activerecord/CHANGELOG.md
* Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-129-9/+9
|\
| * Bump to 3.2.9Santiago Pastorino2012-11-129-9/+9
| |
| * Revert "Add test case to assets eager load"Santiago Pastorino2012-11-091-3/+0
| | | | | | | | This reverts commit 552a3e145373cabe25a78d8d7cba2ceaabd9ecc5.
* | Revert "Add test case to assets eager load"Santiago Pastorino2012-11-091-3/+0
| | | | | | | | This reverts commit 552a3e145373cabe25a78d8d7cba2ceaabd9ecc5.
* | Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-099-9/+9
|\|
| * Bump up to 3.2.9.rc3Santiago Pastorino2012-11-099-9/+9
| |
| * Merge pull request #8161 from guilleiguaran/downgrade-sprocketsRafael Mendonça França2012-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | 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.
| * Revert "Respect children paths filter settings"Santiago Pastorino2012-11-092-13/+6
| | | | | | | | | | This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe. Closes #8146
* | Merge pull request #8161 from guilleiguaran/downgrade-sprocketsRafael Mendonça França2012-11-091-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Lock sprockets to 2.2.xGuillermo Iguaran2012-11-091-1/+1
| |/
* | Fix redirect example blockCarlos Antonio da Silva2012-11-091-3/+3
| | | | | | | | See #8160. [ci skip]
* | Revert "Respect children paths filter settings"Santiago Pastorino2012-11-092-13/+6
| | | | | | | | | | This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe. Closes #8146
* | Merge pull request #8082 from ↵Carlos Antonio da Silva2012-11-093-0/+24
|\ \ | | | | | | | | | | | | nikitug/backport_serialized_attributes_before_type_cast Backport #8078: Fix `attributes_before_type_cast` for serialised attributes
| * | Backport #8078: Fix `attributes_before_type_cast` for serialised attributes.Nikita Afanasenko2012-11-093-0/+24
|/ / | | | | | | 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.
* | Merge pull request #8093 from nikitug/keep_app_x_ua_compatibleCarlos Antonio da Silva2012-11-083-1/+46
| | | | | | | | | | | | | | Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header) Conflicts: actionpack/CHANGELOG.md
* | Merge pull request #8027 from daenney/masterXavier Noria2012-11-083-3/+17
| | | | | | | | | | | | | | | | 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
* | Merge pull request #8149 from senny/backport_7842_to_rails_3_2_stableRafael Mendonça França2012-11-083-1/+11
|\ \ | | | | | | backport: handle trailing slash with engines
| * | backport, handle trailing slash with enginesYves Senn2012-11-083-1/+11
|/ / | | | | | | this is a backport of #8115 to fix #7842
* | Merge pull request #7987 from ↵Santiago Pastorino2012-11-083-3/+28
|\ \ | | | | | | | | | | | | alexisbernard/3-2_find_in_batches_compatible_with_strings Fix find_in_batches with customized primary_key on 3-2-stable
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:23:06 +0000