Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Tree: 0e69705b0f
Commits on May 27, 2012
  1. @drogus

    Fix railties_order when application object is passed

    drogus authored
    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.
  2. @josevalim

    Merge pull request #6494 from pwim/no-memcache-require

    josevalim authored
    memcache require not needed for cache store
Commits on May 26, 2012
  1. @bdurand @pwim

    remove unnecessary memcache equire in ActionDispatch::Session::CacheS…

    bdurand authored pwim committed
Commits on May 25, 2012
  1. @rafaelfranca

    Merge pull request #5244 from fotos/myqsl2_wait_timeout

    rafaelfranca authored
    Maximum wait_timeout on Windows is 2147483
Commits on May 24, 2012
  1. @carlosantoniodasilva

    Merge pull request #5925 from Juanmcuello/pg_structure_dump

    carlosantoniodasilva authored
    Quote arguments in db:structure:dump for PostgreSQL.
Commits on May 23, 2012
  1. @tenderlove

    Merge pull request #6467 from aselder/3-2-stable

    tenderlove authored
    Synchronize the body of the ConnectionPool#release method to improve thread safety.
  2. Synchronize the ConnectionPool#release method to avoid thread safety …

    Andrew Selder authored
    …issues [#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/ `keys'
  3. @Juanmcuello
Commits on May 22, 2012
  1. @rafaelfranca

    Merge pull request #6451 from chancancode/3-2-stable_restore_frozen_s…

    rafaelfranca authored
    Fixes the build break caused by 9ee8528 in #6445.
  2. @chancancode

    Fixes the build break caused by 9ee8528 in #6445.

    chancancode authored
    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.
  3. @rafaelfranca

    Merge pull request #6445 from chancancode/3-2-stable_restore_frozen_s…

    rafaelfranca authored
    Restore the frozen state on rollback. (Backports #6420)
  4. @chancancode

    Restore the frozen state on rollback. Fixes #6417.

    chancancode authored
    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 id: nil, ...>
        >> t.freeze
        => #<Topic id: nil, ...>
        RuntimeError: can't modify a frozen Hash
        >> t.frozen?
        => false
        => true
    This patch fixes the bug by explictly restoring the frozen state on the
    attributes Hash after every rollback.
  5. @drogus

    Use require_dependency in generated controllers

    drogus authored
    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. @tenderlove

    Merge pull request #6418 from pwnall/pgsql_bytea_limit3

    tenderlove authored
    Postgresql doesn't accept limits on binary (bytea) columns (for 3-2-stable)
  2. @carlosantoniodasilva

    Merge pull request #6423 from lest/patch-2

    carlosantoniodasilva authored
    assets: don't add extension if other given and file exists
  3. @lest

    Assets: don't add extension if other given and file exists

    lest authored
    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
    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
    Closes #6310
  4. @pwnall
  5. @drogus

    More info on commit messages in contributing guide

    drogus authored
    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.
  6. @drogus

    Fix generators to help with ambiguous `ApplicationController` issue

    drogus authored
    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:
    module Blog
      class PostsController < ApplicationController
    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. @rafaelfranca

    Merge pull request #6410 from Bodacious/tag_helper_data_fix_3-2-stable

    rafaelfranca authored
    TagHelper creates invalid data attributes when value is a BigDecimal
  2. @josevalim

    Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806…

    josevalim authored
    Template concurrency fixes
  3. @Bodacious
  4. @pinetops
  5. @drogus
  6. @drogus

    Fix uniqueness validator with `allow_nil: false` also for mysql

    drogus authored
    MySQL's adapter was changing value for case sensitive comparison. We
    don't need to do it for `nil`.
  7. @drogus

    Fix `validates_uniqueness_off :field, :allow_nil => false`

    drogus authored
    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:
    SELECT 1 FROM "posts" WHERE "posts"."title" = '' LIMIT 1
    instead of
    SELECT 1 FROM "posts" WHERE "posts"."title" IS NULL LIMIT 1
Commits on May 19, 2012
  1. @carlosantoniodasilva

    Use right option for excerpt text helper in tests, fix build

    carlosantoniodasilva authored
    `excerpt` text helper uses `:radius`, not `line_width` (that is used by
    `word_wrap` helper).
    Also cleanup some whitespaces.
  2. @tenderlove

    Merge pull request #6398 from pmahoney/threadsafe-connection-pool

    tenderlove authored
    Synchronize read and modification of @reserved_connections
  3. @drogus

    Ensure that CollectionAssociation#replace returns proper target

    drogus authored
    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. @josevalim @rafaelfranca

    Merge pull request #5020 from KL-7/fix-blank-image_tag-source

    josevalim authored rafaelfranca committed
    Render img tag with empty src if empty string is passed to image_tag.
  2. @rafaelfranca

    Merge pull request #6390 from ernie/invalid-ruby18-syntax-in-habtm

    rafaelfranca authored
    Invalid ruby18 syntax in habtm
  3. @ernie
  4. @jonleighton
  5. @jonleighton

    Perf: Don't load the association for #delete_all.

    jonleighton authored
    Bug #6289
  6. @rafaelfranca

    Merge pull request #6377 from ihid/depreciate_old_text_helper_apis

    rafaelfranca authored
    Deprecate old APIs for highlight, excerpt and word_wrap
Something went wrong with that request. Please try again.