aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
| * | Remove irrelevant assertionOscar Del Ben2012-05-291-7/+0
| | |
| * | Display annotations from .coffee files in `rake notes`Bartlomiej Kozal2012-05-282-7/+18
| |/
* | Merge pull request #6531 from ↵Rafael Mendonça França2012-05-292-2/+47
|\ \ | |/ |/| | | | | freerange/3-2-stable-minitest-passthrough-exceptions Exceptions like Interrupt should not be rescued in tests.
| * Exceptions like Interrupt should not be rescued in tests.James Mead2012-05-292-2/+47
|/ | | | | This is a back-port of rails/rails#6525. See the commit notes there for details.
* Fix railties_order when application object is passedPiotr Sarnacki2012-05-272-1/+5
| | | | | | | | | | | | | | | railites_order method, introduced in 40b19e0, had a bug that was causing loading application instance twice in initializers if railties_order already included application instance. So for example railties_order = [Foo::Engine, :main_app, Bar::Engine] would result in such railties array: [MyApp::Application, Foo::Engine, MyAppApplication, Bar::Engine] In order to fix it, we need to check for existence of application in both railties_order and railties arrays.
* Merge pull request #6494 from pwim/no-memcache-requireJosé Valim2012-05-271-1/+0
|\ | | | | memcache require not needed for cache store
| * remove unnecessary memcache equire in ActionDispatch::Session::CacheStoreBrian Durand2012-05-261-1/+0
|/
* Merge pull request #5244 from fotos/myqsl2_wait_timeoutRafael Mendonça França2012-05-251-1/+1
| | | | Maximum wait_timeout on Windows is 2147483
* Merge pull request #5925 from Juanmcuello/pg_structure_dumpCarlos Antonio da Silva2012-05-241-2/+2
|\ | | | | Quote arguments in db:structure:dump for PostgreSQL.
| * Use Shellwords to scape arguments in db:structure:dump for PostgreSQL.Juan M. Cuello2012-05-221-2/+2
| | | | | | | | fixes #5913
* | Merge pull request #6467 from aselder/3-2-stableAaron Patterson2012-05-231-10/+12
|\ \ | |/ |/| Synchronize the body of the ConnectionPool#release method to improve thread safety.
| * Synchronize the ConnectionPool#release method to avoid thread safety issues ↵Andrew Selder2012-05-231-10/+12
|/ | | | | | | | | | | | | | | | | | | | [#6464] Fixes #6464 Synchronize the contents of the release method in ConnectionPool due to errors when running in high concurrency environments. Detected invalid hash contents due to unsynchronized modifications with concurrent users org/jruby/RubyHash.java:1356:in `keys' /usr/local/rvm/gems/jruby-1.6.7@new_import/gems/activerecord-3.2.3/lib/a ctive_record/connection_adapters/abstract/connection_pool.rb:294:in `release' /usr/local/rvm/gems/jruby-1.6.7@new_import/gems/activerecord-3.2.3/lib/a ctive_record/connection_adapters/abstract/connection_pool.rb:282:in `checkin'
* Merge pull request #6451 from ↵Rafael Mendonça França2012-05-221-2/+4
|\ | | | | | | | | chancancode/3-2-stable_restore_frozen_state_on_rollback Fixes the build break caused by 9ee8528 in #6445.
| * Fixes the build break caused by 9ee8528 in #6445.Godfrey Chan2012-05-221-2/+4
|/ | | | | | | | Ruby 1.8 raises a TypeError when trying to modify a frozen Hash, while Ruby 1.9 raises a RuntimeError instead. Also, Ruby < 1.9.3 uses a lowercase 'hash' in the exception message while Ruby >= 1.9.3 uses an uppercase 'Hash' instead. This commit normalizes those issues in the test case.
* Merge pull request #6445 from ↵Rafael Mendonça França2012-05-222-1/+13
|\ | | | | | | | | chancancode/3-2-stable_restore_frozen_state_on_rollback Restore the frozen state on rollback. (Backports #6420)
| * Restore the frozen state on rollback. Fixes #6417.Godfrey Chan2012-05-222-1/+13
|/ | | | | | | | | | | | | | | | | | | | | | This is a 3-2-stable backport for #6420 which was merged into master. Currently, when saving a frozen record, an exception would be thrown which causes a rollback. However, there is a bug in active record that "defrost" the record as a side effect: >> t = Topic.new => #<Topic id: nil, ...> >> t.freeze => #<Topic id: nil, ...> >> t.save RuntimeError: can't modify a frozen Hash >> t.frozen? => false >> t.save => true This patch fixes the bug by explictly restoring the frozen state on the attributes Hash after every rollback.
* Use require_dependency in generated controllersPiotr Sarnacki2012-05-223-4/+4
| | | | | | | Using require in development mode will prevent required files from reloading, even if they're changed. In order to keep namespaced application_controller reloadable, we need to use require_dependency instead of require.
* Merge pull request #6418 from pwnall/pgsql_bytea_limit3Aaron Patterson2012-05-212-8/+20
|\ | | | | Postgresql doesn't accept limits on binary (bytea) columns (for 3-2-stable)
| * Postgresql doesn't accept limits on binary (bytea) columns.Victor Costan2012-05-212-8/+20
| |
* | Merge pull request #6423 from lest/patch-2Carlos Antonio da Silva2012-05-213-2/+10
|\ \ | | | | | | assets: don't add extension if other given and file exists
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 00:47:43 +0000