aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'acapilleri-update_nested_attributes'Rafael Mendonça França2012-06-212-5/+25
| | | | | | | Closes #6675 Conflicts: activerecord/lib/active_record/attribute_methods/dirty.rb
* Merge pull request #6758 from caironoleto/masterJosé Valim2012-06-181-13/+13
| | | | | | Fixing load config in some tasks Conflicts: activerecord/lib/active_record/railties/databases.rake
* Merge pull request #6649 from route/logger_in_metal_3_2Carlos Antonio da Silva2012-06-182-2/+21
|\ | | | | Logger in metal backport for 3.2
| * Added test for case when view doesn't have logger method when using ↵Dmitry Vorotilin2012-06-161-0/+17
| | | | | | | | ActionController::Metal controller.
| * ActionController::Metal doesn't have logger method, check it and then delegateDmitry Vorotilin2012-06-161-2/+4
| |
* | Merge pull request #6742 from steveklabnik/deprecate_composed_ofRafael Mendonça França2012-06-185-7/+24
|\ \ | | | | | | Deprecate composed of
| * | Deprecating composed_of in ActiveRecordSteve Klabnik2012-06-185-7/+24
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Use strict_args_position! if available from ThorJosé Valim2012-06-181-0/+1
| |
* | Merge pull request #6764 from frodsan/patch-4Rafael Mendonça França2012-06-171-2/+2
|\ \ | | | | | | bump AS deprecation_horizon to 4.0
| * | bump AS deprecation_horizon to 4.0Francesco Rodríguez2012-06-171-2/+2
|/ /
* | Merge pull request #6756 from arunagw/build_fix_apRafael Mendonça França2012-06-161-1/+1
|\ \ | | | | | | Build fix actionpack
| * | It should also include text/css => Build FixArun Agrawal2012-06-161-1/+1
|/ /
* / Merge pull request #6752 from steveklabnik/fix_5680Rafael Mendonça França2012-06-163-4/+21
|/ | | | Respect absolute paths in compute_source_path.
* Remove unneded tests.Rafael Mendonça França2012-06-141-11/+1
| | | | | | | 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.
* registers the deprecation of update_attribute in the CHANGELOGXavier Noria2012-06-141-0/+8
|
* Merge pull request #6739 from steveklabnik/3-2-stableXavier Noria2012-06-147-17/+41
|\ | | | | Deprecate update_attribute
| * Deprecate update_attribute.Steve Klabnik2012-06-147-17/+41
| | | | | | | | | | | | | | | | | | | | | | 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
* | adding a test for #6459Aaron Patterson2012-06-141-0/+10
|/
* ActionController::Caching depends on RackDelegation and ↵Santiago Pastorino2012-06-132-0/+35
| | | | AbstractController::Callbacks
* Merge pull request #6716 from frodsan/patch-2Rafael Mendonça França2012-06-121-1/+1
|\ | | | | Fix Build
| * Fix buildFrancesco Rodríguez2012-06-121-1/+1
|/
* Merge branch '3-2-stable-rel' into 3-2-stableAaron Patterson2012-06-1220-16/+58
|\ | | | | | | | | | | | | | | | | | | * 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
| * updating changelogsAaron Patterson2012-06-127-7/+11
| |
| * bumping version numbersAaron Patterson2012-06-119-9/+9
| |
| * updating changelogs with security fixesAaron Patterson2012-06-112-0/+6
| |
| * updating changelogsAaron Patterson2012-06-115-0/+20
| |
| * Array parameters should not contain nil values.Aaron Patterson2012-06-112-2/+8
| |
| * Additional fix for CVE-2012-2661Ernie Miller2012-06-112-3/+9
| | | | | | | | | | | | | | | | 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.
* | Merge pull request #6715 from arunagw/add_assertsRafael Mendonça França2012-06-121-2/+2
| | | | | | | | Need a assert here in tests
* | Merge pull request #6676 from aurelian/masterRafael Mendonça França2012-06-122-1/+5
| | | | | | | | Don't assign the attributes if the list is empty
* | Merge pull request #6682 from acapilleri/dup_validation_fix_backport_for_1_9_3Rafael Mendonça França2012-06-123-1/+16
|\ \ | |/ |/| Dup validation fix backport for 1 9 3
| * Fix the the backport of the object dup with the ruby 1.9.3p194.Angelo capilleri2012-06-123-1/+16
| | | | | | | | | | | | 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
* | Change the string to use in test case.kennyj2012-06-112-2/+2
| | | | | | | | | | | | | | Conflicts: activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb activerecord/test/cases/adapters/mysql2/schema_test.rb
* | Fix GH #3163. Should quote database on mysql/mysql2.kennyj2012-06-113-1/+22
| | | | | | | | | | | | Conflicts: activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
* | Merge pull request #6690 from suginoy/fix-templates-copyRafael Mendonça França2012-06-112-1/+13
| | | | | | | | | | | | Fix: 'rake rails:templates:copy' doesn't work Conflicts: railties/test/application/rake_test.rb
* | Merge pull request #6698 from yahonda/address_ora_911_masterRafael Mendonça França2012-06-112-2/+2
| | | | | | | | Address ORA-00911 errors because of the heading underscore.
* | Merge pull request #6521 from Empact/throw-resultRafael Mendonça França2012-06-102-1/+8
| | | | | | | | | | | | Fix that #exists? can blow up with ThrowResult exception Conflicts: activerecord/lib/active_record/relation/finder_methods.rb
* | Remove warningRafael Mendonça França2012-06-101-1/+1
| |
* | Add test to column alias in `exists?` SQL.Rafael Mendonça França2012-06-101-0/+6
| | | | | | | | | | | | | | | | This behavior was added in dd286a4c735dac1db8c9262581c7f29c44d1f695 Closes #1139. Fixes #2553, #1141, #1623 and #2062.
* | Minimal change to query generation of exists? that makes SQLServer and ↵iaddict2012-06-101-1/+1
| | | | | | | | | | | | | | others happy that do not work without a column alias. Conflicts: activerecord/lib/active_record/relation/finder_methods.rb
* | Merge pull request #6688 from ↵Rafael Mendonça França2012-06-102-2/+7
|\ \ | | | | | | | | | | | | c42engineering/buffered_logger_level_while_creation BufferedLogger level while creation
| * | buffered logger is initialized with the log level passed trough the initializerNiranjan Paranjape2012-06-092-2/+7
| | |
* | | Merge pull request #6695 from kennyj/fix_6635Rafael Mendonça França2012-06-102-5/+14
| | | | | | | | | | | | Fix #6635. We should call Scoping methods, before calling Array methods.
* | | Merge pull request #6693 from jkraemer/3-2-stableJosé Valim2012-06-101-1/+1
|\ \ \ | | | | | | | | Bugfix: Namespace collision with test-unit-activesupport 1.0.0
| * | | fix namespace collision with test-unit-activesupportJens Kraemer2012-06-101-1/+1
|/ / /
* | | Merge pull request #6687 from tiegz/3-2-optimizationsJosé Valim2012-06-091-1/+3
|\ \ \ | | | | | | | | ActiveRecord#attributes optimization: minimize objects created
| * | | ActiveRecord#attributes optimization: minimize objects createdTieg Zaharia2012-06-091-1/+3
| |/ /
* | | Merge pull request #6689 from arunagw/duplicate_test_removedAndrew White2012-06-091-16/+0
|\ \ \ | |/ / |/| | Duplicate test removed
| * | Duplicate tests removed.Arun Agrawal2012-06-091-16/+0
|/ /
* | Don't add sqlite3 to gemspec with -O on rails plugin newPiotr Sarnacki2012-06-082-0/+10
| | | | | | | | (closes #6672)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 02:29:20 +0000