| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
See issue #7950.
The previous commit fixes this bug, and is a backport of
4bc2ae0da1dd812aee759f6d13ad428354cd0e13.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`
Conflicts:
actionpack/CHANGELOG.md
actionpack/test/template/template_test.rb
|
| |\ \ \ \
| | | | |
| | | | | |
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
|
| |/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Plugin generator crashes when using the --dummy-path option
Code was assuming the application name in `config/application.rb`
was module Dummy.
|
| |\ \ \ \
| | | | |
| | | | | |
[ci skip] Correct examples for form_tag helper.
|
| |/ / / / |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
activerecord/test/cases/locking_test.rb
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
backport #8176, `#pluck` can be used on a relation with `select` clause.
Conflicts:
activerecord/CHANGELOG.md
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/relation/calculations.rb
activerecord/test/cases/calculations_test.rb
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Use nil? instead of blank? to check dynamic finder result
Conflicts:
activerecord/CHANGELOG.md
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
Fix deleting from a HABTM join table upon destroying an object of a mode...
|
| |/ / / / /
| | | | |
| | | | |
| | | | | |
with optimistic locking enabled. Fixes #5332.
|
| |\ \ \ \ \
| |/ / / /
|/| | | | |
Backport #8074 to 3-2-stable. Use query cache/uncache, when using not only database.yml but also DATABASE_URL.
|
| |/ / / /
| | | |
| | | |
| | | | |
database.yml but also DATABASE_URL.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | | |
Introduced in 3e53fe6.
|
| |\ \ \ \
| | | | |
| | | | | |
Fix 3-2-stable to work with Mocha v0.13.0
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| |\ \ \ \ \
| |/ / / /
|/| | | | |
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
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | | |
Add release date of Rails 3.2.9 to documentation [ci skip]
|
| |/ / / / |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Remove unwanted transaction when has one association is built
Conflicts:
activerecord/CHANGELOG.md
|
| |\ \ \ \
| |/ / /
|/| | /
| | |/
| |/| |
|
| | | | |
|
| | | |
| | |
| | |
| | | |
This reverts commit 552a3e145373cabe25a78d8d7cba2ceaabd9ecc5.
|
| | | |
| | |
| | |
| | | |
This reverts commit 552a3e145373cabe25a78d8d7cba2ceaabd9ecc5.
|
| |\| | |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
| | |
| | |
| | |
| | | |
This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe.
Closes #8146
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | |/ / |
|
| | | |
| | |
| | |
| | | |
See #8160. [ci skip]
|
| | | |
| | |
| | |
| | |
| | | |
This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe.
Closes #8146
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
nikitug/backport_serialized_attributes_before_type_cast
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.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header)
Conflicts:
actionpack/CHANGELOG.md
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \ \
| | | |
| | | | |
backport: handle trailing slash with engines
|
