aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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)
* | Merge pull request #6678 from arunagw/fix_issue_6673Rafael Mendonça França2012-06-082-1/+9
|\ \ | | | | | | Fix issue 6673
| * | We should not include engine.rake file into rakeArun Agrawal2012-06-082-1/+9
| |/ | | | | | | | | | | | | | | | | | | if we are passing -T which is skip_test_unit See issue #6673 for more details. I saw that we are not creating dummy app even if we do skip_test_unit. Fixes #6673
* | Merge pull request #6677 from arunagw/3-2-stableRafael Mendonça França2012-06-081-2/+0
|\ \ | |/ |/| Removed protected as we already doing it above.
| * Removed protected as we already doing it above. Arun Agrawal2012-06-081-2/+0
|/
* Fix railties test suitePiotr Sarnacki2012-06-081-2/+1
| | | | | | Apparently asset_environment should not be invoked if it's not needed. This fixes broken build by getting back to the code more similar to the version changed here: 5b0a891
* Fix asset tags for files with more than one dotPiotr Sarnacki2012-06-074-1/+9
| | | | | | | | | | | | | | | After the fix done in 39f9f02a, there are cases that will not work correctly. If you have file with "2 extensions", like foo.min.js and you reference the file without extension, like: javascript_include_tag "foo.min" it will fail because sprockets finds foo.min.js with foo.min argument. This commit fixes this case and will get the right file even when referrencing it without extension. (closes #6598)
* Make test cover previous reversionJon Leighton2012-06-071-0/+1
|
* Revert "Perf: Don't load the association for #delete_all."Jon Leighton2012-06-076-45/+21
| | | | | | | | | | This reverts commit b98d1e21635d8776de8893cc09bd86c71f6c78f0. Closes #6609 Conflicts: activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
* Merge pull request #6642 from kuroda/3-2-activemodel-translation-patchJosé Valim2012-06-062-2/+7
|\ | | | | Fix human attribute_name to handle deeply nested attributes
| * Fix human attribute_name to handle deeply nested attributesTsutomu Kuroda2012-06-062-2/+7
|/ | | | | This is a back-port of b0e2fc84 to Rails 3.2. See #5843 and #3859 also.
* Revert "fix the Flash middleware loading the session on every request (very ↵Rafael Mendonça França2012-06-053-23/+7
| | | | | | | | | dangerous especially with Rack::Cache), it should only be loaded when the flash method is called" This reverts commits e3069c64b2c5ddc7a5789b55b8efd4902d9e9729 and 2b2983d76fd11efc219273036a612f47cfaa5bfa. Reason: This add a non-backward compatible change in the way that flash works now (swept in every request).
* Add test to flash sweep after two redirectsRafael Mendonça França2012-06-051-0/+20
| | | | | This test is needed to avoid regressions in the way that flash works now (swept in every request).
* Merge pull request #6613 from carlosgaldino/3-2-data-confirmRafael Mendonça França2012-06-056-22/+128
|\ | | | | Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` option
| * Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` optionCarlos Galdino2012-06-056-22/+128
|/ | | | | | | | | | | | This deprecation applies to: `button_to` `button_tag` `image_submit_tag` `link_to` `submit_tag` As :confirm is an UI specific option is better to use the data attributes, teaching users about unobtrusive JavaScript and how Rails works with it.
* Merge pull request #6622 from kennyj/fix_6591-32Rafael Mendonça França2012-06-042-1/+13
|\ | | | | [3-2-stable back ported] Fix #6591 Rails 3.2.5 Regression: incorrect _changed? for datetimes
| * Fix #6591. If a field with timezone isn't changed, we don't call will_change!.kennyj2012-06-041-1/+2
| |
| * Add failing test for 3.2.5 datetime attribute regressionEvan Arnold2012-06-041-0/+11
|/
* Merge pull request #6593 from ↵Rafael Mendonça França2012-06-011-1/+3
|\ | | | | | | | | yahonda/skip_test_remove_column_with_array_as_an_argument_is_deprecated Skip test_remove_column_with_array_as_an_argument_is_deprecated with Oracle
| * Skip test_remove_column_with_array_as_an_argument_is_deprecated with Oracle ↵Yasuo Honda2012-06-021-1/+3
| | | | | | | | | | | | | | adapter. Because Oracle adapter supports only remove_column :table_name, :column_name syntax and it has never supported remove_column :table_name, [:column_name].
* | Allow to use mounted helpers in ActionView::TestCasePiotr Sarnacki2012-06-014-1/+24
| | | | | | | | | | Similarly to 6525002, this allows to use routes helpers for mounted helpers, but this time in ActionView::TestCase
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 19:38:28 +0000