| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | | |
|
| | |
| | |
| | |
| | | |
method_missing with Marshal.dump and Marshal.load is changing in ruby 2.0.0 later.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.)
|
| | |
| | |
| | |
| | | |
No sense over-testing this MRI-specific behavior. See ruby/ruby@8d6add973ebcb3b4c1efbfaf07786550a3e219af
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
|
| | |
| | |
| | |
| | | |
few times, so fix up the test to work with however it chooses to escape.
|
| | |
| | |
| | |
| | | |
this file with us-ascii
|
| | | |
|
| | |
| | |
| | |
| | | |
Ruby 2.0 Object#inspect does not call #to_s by default anymore.
|
| | | |
|
| | | |
|
|/ / |
|
|\ \
| | |
| | | |
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.
|
| | |
|
|\ \
| | |
| | | |
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.
|
| | |
|
| |
| |
| |
| | |
desired order
|
|\ \
| | |
| | | |
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.
|
|\ \
| | |
| | | |
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.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| | |
| | | |
Update activemodel/CHANGELOG.md
|
|/ /
| |
| | |
Fixed a typo
|
| |
| |
| |
| |
| |
| |
| | |
This reverts commit c5451777b038c5e48567f69256986ae42a2cde48.
Conflicts:
activerecord/CHANGELOG.md
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
don't cache invalid subsets when preloading hmt associations
Conflicts:
activerecord/CHANGELOG.md
activerecord/test/cases/associations/eager_test.rb
|
|\ \
| | |
| | | |
Add Ruby 2.0 RC to Travis CI build matrix
|
|/ / |
|
| |
| |
| |
| | |
Other changelogs were fixed in f15581b1bab8fa042f4614f9b2709c3c580ad9d1.
|
|\ \
| | |
| | | |
Fixed changelog typos [ci skip]
|
|/ / |
|
|\ \
| | |
| | | |
Backport of #8400 to fix for issue #7630, a bug in has_many :through counter caches.
|
|/ / |
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
protection
Fixes: CVE-2013-0276
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
Conflicts:
actionpack/actionpack.gemspec
|
| | |
| | |
| | |
| | | |
[3.2] Fix test failure for ruby 1.8.
|
| | |
| | |
| | |
| | |
| | |
| | | |
[3.2] active_record: Quote numeric values compared to string columns.
Conflicts:
activerecord/CHANGELOG.md
|