| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |
|
|
|
|
| |
Disable query cache for lock queries
Conflicts:
activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
|
| | |
|
| |\
| |
| | |
MIssed backport for 3.2
|
| |/ |
|
| |
|
|
|
|
|
|
|
|
| |
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.
|
| |\
| |
| | |
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.
|
| |
|
|
| |
active_support/core_ext/string/inflections.rb [fixes #6884]
|
| |
|
|
|
|
| |
fix bug in limit of enum columns of mysql
Closes #6432
|
| |
|
|
|
|
| |
Require URI in ConnectionSpecification
Conflicts:
activerecord/lib/active_record/connection_adapters/connection_specification.rb
|
| |
|
|
| |
Missing require breaks Time.=== when selectively loading ActiveSupport core_exts in 3.2.4+
|
| |
|
|
|
|
|
|
| |
Fix build issue with postgresql.
Conflicts:
activerecord/lib/active_record/relation/calculations.rb
activerecord/test/cases/calculations_test.rb
|
| |
|
|
|
|
| |
Stop assuming strings for grouped calculations
Conflicts:
activerecord/lib/active_record/relation/calculations.rb
|
| | |
|
| |
|
|
|
|
|
| |
Closes #6675
Conflicts:
activerecord/lib/active_record/attribute_methods/dirty.rb
|
| |
|
|
|
|
| |
Fixing load config in some tasks
Conflicts:
activerecord/lib/active_record/railties/databases.rake
|
| |\
| |
| | |
Logger in metal backport for 3.2
|
| | |
| |
| |
| | |
ActionController::Metal controller.
|
| | | |
|
| |\ \
| | |
| | | |
Deprecate composed of
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | | |
|
| |\ \
| | |
| | | |
bump AS deprecation_horizon to 4.0
|
| |/ / |
|
| |\ \
| | |
| | | |
Build fix actionpack
|
| |/ / |
|
| |/
|
|
| |
Respect absolute paths in compute_source_path.
|
| |
|
|
|
|
|
| |
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.
|
| | |
|
| |\
| |
| | |
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
|
| |/ |
|
| |
|
|
| |
AbstractController::Callbacks
|
| |\
| |
| | |
Fix Build
|
| |/ |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
| |
| |
| | |
Need a assert here in tests
|
| | |
| |
| |
| | |
Don't assign the attributes if the list is empty
|
| |\ \
| |/
|/| |
Dup validation fix backport for 1 9 3
|
| | |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| |
| | |
Conflicts:
activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
activerecord/test/cases/adapters/mysql2/schema_test.rb
|
| | |
| |
| |
| |
| |
| | |
Conflicts:
activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
|
| | |
| |
| |
| |
| |
| | |
Fix: 'rake rails:templates:copy' doesn't work
Conflicts:
railties/test/application/rake_test.rb
|
