Permalink
Commits on May 22, 2012
  1. Fixes the build break caused by 9ee8528 in #6445.

    chancancode committed May 22, 2012
    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.
  2. Merge pull request #6445 from chancancode/3-2-stable_restore_frozen_s…

    rafaelfranca committed May 22, 2012
    …tate_on_rollback
    
    Restore the frozen state on rollback. (Backports #6420)
  3. Restore the frozen state on rollback. Fixes #6417.

    chancancode committed May 22, 2012
    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.
  4. Use require_dependency in generated controllers

    drogus committed May 22, 2012
    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.
Commits on May 21, 2012
  1. Merge pull request #6418 from pwnall/pgsql_bytea_limit3

    tenderlove committed May 21, 2012
    Postgresql doesn't accept limits on binary (bytea) columns (for 3-2-stable)
  2. Merge pull request #6423 from lest/patch-2

    carlosantoniodasilva committed May 21, 2012
    assets: don't add extension if other given and file exists
  3. Assets: don't add extension if other given and file exists

    lest committed May 21, 2012
    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
  4. More info on commit messages in contributing guide

    drogus committed May 21, 2012
    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.
  5. Fix generators to help with ambiguous `ApplicationController` issue

    drogus committed May 20, 2012
    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
Commits on May 20, 2012
  1. Merge pull request #6410 from Bodacious/tag_helper_data_fix_3-2-stable

    rafaelfranca committed May 20, 2012
    TagHelper creates invalid data attributes when value is a BigDecimal
  2. Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806…

    josevalim committed May 20, 2012
    …f7b028614c
    
    Template concurrency fixes
  3. Improve docs for `try` by adding note on `BasicObject`

    drogus committed May 20, 2012
    [ci skip] closes #5790
  4. Fix uniqueness validator with `allow_nil: false` also for mysql

    drogus committed May 20, 2012
    MySQL's adapter was changing value for case sensitive comparison. We
    don't need to do it for `nil`.
  5. Fix `validates_uniqueness_off :field, :allow_nil => false`

    drogus committed May 20, 2012
    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
    ```
Commits on May 19, 2012
  1. Use right option for excerpt text helper in tests, fix build

    carlosantoniodasilva committed May 19, 2012
    `excerpt` text helper uses `:radius`, not `line_width` (that is used by
    `word_wrap` helper).
    
    Also cleanup some whitespaces.
  2. Merge pull request #6398 from pmahoney/threadsafe-connection-pool

    tenderlove committed May 19, 2012
    Synchronize read and modification of @reserved_connections
  3. Ensure that CollectionAssociation#replace returns proper target

    drogus committed May 18, 2012
    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.
Commits on May 18, 2012
  1. Merge pull request #5020 from KL-7/fix-blank-image_tag-source

    josevalim committed with rafaelfranca May 18, 2012
    Render img tag with empty src if empty string is passed to image_tag.
  2. Merge pull request #6390 from ernie/invalid-ruby18-syntax-in-habtm

    rafaelfranca committed May 18, 2012
    Invalid ruby18 syntax in habtm
  3. Perf: Don't load the association for #delete_all.

    jonleighton committed May 18, 2012
    Bug #6289
    
    Conflicts:
    
    	activerecord/test/cases/associations/has_many_associations_test.rb
  4. Merge pull request #6377 from ihid/depreciate_old_text_helper_apis

    rafaelfranca committed May 18, 2012
    Deprecate old APIs for highlight, excerpt and word_wrap
Commits on May 17, 2012
  1. Merge pull request #6367 from frodsan/fix_validators_docs

    vijaydev committed May 17, 2012
    Fix validators docs [3-2-stable]
  2. fix validations docs

    Francesco Rodriguez committed May 17, 2012
  3. Fix CollectionAssociation#replace to return new target (closes #6231)

    drogus committed May 10, 2012
    Conflicts:
    
    	activerecord/test/cases/associations/has_many_associations_test.rb
Commits on May 16, 2012
  1. Merge pull request #6340 from bcardarella/patch-3

    tenderlove committed May 16, 2012
    Changing the indentation level of the block comment close for Sass
  2. Changing the indentation level of the block comment close for SASS

    bcardarella committed May 16, 2012
    If one wants to use use SASS for application.css.sass the comment block indentation is invalid.
Commits on May 15, 2012
  1. Merge pull request #6329 from acapilleri/backport_dup_validation_3_2

    rafaelfranca committed May 15, 2012
    Backport dup validation 3 2
  2. add backport for the pull request #6324

    Angelo Capilleri committed May 15, 2012