aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
| * | Assets: don't add extension if other given and file existsSergey Nartimov2012-05-213-2/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | We should lookup if asset without appended extension exists. When sprockets are disabled the asset tag helpers incorporate this logic. When sprockets are enabled we should have the same logic. For example, we have style.ext file in app/assets/stylesheets and we use stylesheet_link_tag in the layout. In this case we should have /assets/style.ext instead of /assets/style.ext.css in the output. Closes #6310
* / More info on commit messages in contributing guidePiotr Sarnacki2012-05-211-1/+33
|/ | | | | | | | | Add more info on how to write a good commit messages along with example showing nicely formatted commit message. Rails git history does not look too well when you try to figure out why particular changes were introduced. We can do much better than that and it's never too late to start.
* Fix generators to help with ambiguous `ApplicationController` issuePiotr Sarnacki2012-05-204-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In development mode, dependencies are loaded dynamically at runtime, using `const_missing`. Because of that, when one of the constants is already loaded and `const_missing` is not triggered, user can end up with unexpected results. Given such file in an Engine: ```ruby module Blog class PostsController < ApplicationController end end ``` If you load it first, before loading any application files, it will correctly load `Blog::ApplicationController`, because second line will hit `const_missing`. However if you load `ApplicationController` first, the constant will be loaded already, `const_missing` hook will not be fired and in result `PostsController` will inherit from `ApplicationController` instead of `Blog::ApplicationController`. Since it can't be fixed in `AS::Dependencies`, the easiest fix is to just explicitly load application controller. closes #6413
* Merge pull request #6410 from Bodacious/tag_helper_data_fix_3-2-stableRafael Mendonça França2012-05-202-3/+3
|\ | | | | TagHelper creates invalid data attributes when value is a BigDecimal
| * Fixed tag_helper data-attribute bug with BigDecimalsBodacious2012-05-202-3/+3
| |
* | Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614cJosé Valim2012-05-201-10/+22
|\ \ | |/ |/| Template concurrency fixes
| * Prevent concurrent compilation of templates - closes #6400Tom Clarke2012-05-201-10/+22
| |
* | Improve docs for `try` by adding note on `BasicObject`Piotr Sarnacki2012-05-201-0/+4
| | | | | | | | [ci skip] closes #5790
* | Fix uniqueness validator with `allow_nil: false` also for mysqlPiotr Sarnacki2012-05-191-1/+1
| | | | | | | | | | MySQL's adapter was changing value for case sensitive comparison. We don't need to do it for `nil`.
* | Fix `validates_uniqueness_off :field, :allow_nil => false`Piotr Sarnacki2012-05-192-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes (#5853) Uniqueness validator was not properly checking if there are any existing records, when value was `nil` and column was text type. `nil` was converted to string, which resulted in queries looking like: ```sql SELECT 1 FROM "posts" WHERE "posts"."title" = '' LIMIT 1 ``` instead of ```sql SELECT 1 FROM "posts" WHERE "posts"."title" IS NULL LIMIT 1 ```
* | Use right option for excerpt text helper in tests, fix buildCarlos Antonio da Silva2012-05-192-10/+10
| | | | | | | | | | | | | | `excerpt` text helper uses `:radius`, not `line_width` (that is used by `word_wrap` helper). Also cleanup some whitespaces.
* | Merge pull request #6398 from pmahoney/threadsafe-connection-poolAaron Patterson2012-05-191-4/+8
| | | | | | | | Synchronize read and modification of @reserved_connections
* | Ensure that CollectionAssociation#replace returns proper targetPiotr Sarnacki2012-05-192-3/+3
| | | | | | | | | | | | | | | | The fix commited in e2a070c was returning the `new_target`, as a try to return whatever user replaced association with. The problem is, the resulting association target may be ordered differently. In such case we want to return the target that will be later used for that association.
* | Merge pull request #5020 from KL-7/fix-blank-image_tag-sourceJosé Valim2012-05-182-2/+3
| | | | | | | | Render img tag with empty src if empty string is passed to image_tag.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 01:48:11 +0000