aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
* | Merge pull request #6588 from nbibler/polymorphic_to_modelJosé Valim2012-06-012-2/+34
|\ \ | | | | | | Correct the use of to_model in polymorphic routing
| * | Use to_model delegates for polymorphic route generationNathaniel Bibler2012-06-012-2/+34
| |/
* | Add release date of 3.2.5 on the CHANGELOGRafael Mendonça França2012-06-015-3/+34
| |
* | Include routes.mounted_helpers into integration testsPiotr Sarnacki2012-06-013-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In integration tests, you might want to use helpers from engines that you mounted in your application. It's not hard to add it by yourself, but it's unneeded boilerplate. mounted_helpers are now included by default. That means that given engine mounted like: mount Foo::Engine => "/foo", :as => "foo" you will be able to use paths from this engine in tests this way: foo.root_path #=> "/foo" (closes #6573)
* | Merge pull request #6587 from amatsuda/controller_generator_remove_blank_line_32Rafael Mendonça França2012-06-012-2/+2
|\ \ | |/ |/| Backporting #6586 patch to 3-2-stable
| * remove unneeded blank line from !namespeced? controller generatorsAkira Matsuda2012-06-012-2/+2
|/
* bumping to 3.2.5Aaron Patterson2012-05-319-9/+9
|
* Restore behavior of Active Record 3.2.3 scopesAndrew White2012-06-014-31/+4
| | | | | | | | | | | | | | A series of commits relating to preloading and scopes caused a regression. Cloning the relation calls initialize_copy which resets a number of instance variables to nil. Without this the scope thinks that it is already loaded when it is called again. Reverts the following commits: 13f1401a6cf0266a3b0a91b173f976db2d4e50f3 8491740ca5361ba9df20e1c8b906c709f5bfbc12 dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e Fixes #6575, #6576 & #6577
* Merge branch '3-2-rel' into 3-2-stableAaron Patterson2012-05-3116-13/+47
|\ | | | | | | | | | | | | | | * 3-2-rel: bumping to 3.2.4 adding security notifications to CHANGELOGs updating changelogs Merge pull request #6558 from parndt/fix_regression
| * bumping to 3.2.4Aaron Patterson2012-05-319-9/+9
| |
| * adding security notifications to CHANGELOGsAaron Patterson2012-05-312-0/+6
| |
| * Merge branch '3-2-stable-sec' into 3-2-relAaron Patterson2012-05-315-5/+66
| |\ | | | | | | | | | | | | | | | * 3-2-stable-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
| * | updating changelogsAaron Patterson2012-05-317-4/+32
| | |
| * | Merge pull request #6558 from parndt/fix_regressionAaron Patterson2012-05-301-3/+4
| | | | | | | | | | | | Fix regression
* | | Merge branch '3-2-stable-sec' into 3-2-stableAaron Patterson2012-05-3114-22/+83
|\ \ \ | | |/ | |/| | | | | | | | | | | | | * 3-2-stable-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this bumping to 3.2.4.rc1
| * | Strip [nil] from parameters hash.Aaron Patterson2012-05-302-1/+28
| | | | | | | | | | | | | | | | | | Thanks to Ben Murphy for reporting this! CVE-2012-2660
| * | predicate builder should not recurse for determining where columns.Aaron Patterson2012-05-303-4/+38
| |/ | | | | | | | | | | Thanks to Ben Murphy for reporting this CVE-2012-2661
| * bumping to 3.2.4.rc1Aaron Patterson2012-05-289-17/+17
| |
* | Merge pull request #6562 from martinoconnor/generator-fix-stableRafael Mendonça França2012-05-302-2/+2
|\ \ | | | | | | 3-2-stable Changed symbol platform to platforms for the commented out call to gem 'therubyracer'.
| * | Changed symbol platform to platforms for the commented out call to gem ↵Martin O'Connor2012-05-302-2/+2
|/ / | | | | | | | | | | | | 'therubyracer'. Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms. Updating tests.
* | Merge pull request #6558 from parndt/fix_regressionAaron Patterson2012-05-301-3/+4
|\ \ | | | | | | Fix regression
| * | Revert "Removes unneeded caching from ActiveRecord::Base.relation"Philip Arndt2012-05-311-3/+4
|/ / | | | | | | | | | | | | | | | | | | This reverts commit ebfa58abc895c0639211cb896a47b04e424322c8. This change caused a regression in my application's tests: * Failing build http://travis-ci.org/#!/resolve/refinerycms/builds/1461242 Broken tests pass after this change is reverted.
* | Merge pull request #6477 from steveklabnik/close_discovered_pg_connectionRafael Mendonça França2012-05-301-1/+2
| | | | | | | | Properly discover a connection is closed in postgresql_adapter
* | Merge pull request #6553 from erichmenge/3-2-stable-json-patchPiotr Sarnacki2012-05-304-10/+32
|\ \ | | | | | | 3 2 stable json patch
| * | Deprecate ActiveSupport::JSON::VariableErich Menge2012-05-303-4/+20
| | |
| * | True, False, and Nil should be represented in as_json as themselves.Erich Menge2012-05-302-6/+12
| | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/json/encoding.rb activesupport/test/json/encoding_test.rb
* | | Merge pull request #5810 from kennyj/fix_5797Aaron Patterson2012-05-304-5/+15
|/ / | | | | | | | | | | Fix #5797. Error calling dup method on AR model with serialized field Conflicts: activerecord/lib/active_record/core.rb
* | Merge pull request #6519 from oscardelben/3-2-stableCarlos Antonio da Silva2012-05-292-7/+11
|\ \ | | | | | | Display annotations in coffee files
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 12:02:30 +0000