Skip to content
Commits on Aug 10, 2012
  1. @brainopia
  2. @brainopia

    Revert "Revert "Merge pull request #6084 from brainopia/support_for_m…

    …agic_domain_on_all_stores""
    
    This reverts commit a48ea68.
    brainopia committed Aug 10, 2012
Commits on Aug 9, 2012
  1. @spastorino

    Merge pull request #7309 from amerine/3-2-stable

    Add html_escape note to CHANGELOG
    spastorino committed Aug 9, 2012
  2. @amerine
  3. @spastorino
  4. @spastorino

    Bump to 3.2.8

    spastorino committed Aug 9, 2012
  5. @spastorino
  6. @spastorino

    Do not mark strip_tags result as html_safe

    Thanks to Marek Labos & Nethemba
    
    CVE-2012-3465
    spastorino committed Aug 8, 2012
  7. @spastorino

    escape select_tag :prompt values

    CVE-2012-3463
    spastorino committed Aug 8, 2012
  8. @rafaelfranca

    Merge pull request #7299 from iHiD/3-2-stable-store

    Ported PR #4856 to 3-2-stable.
    rafaelfranca committed Aug 9, 2012
  9. @rafaelfranca

    Add CHANGELOG entry

    rafaelfranca committed Aug 9, 2012
  10. @iHiD @rafaelfranca

    Backport #7173.

    iHiD committed with rafaelfranca Aug 9, 2012
  11. @iHiD

    Ported PR #4856 to 3-2-stable.

    iHiD committed Aug 9, 2012
Commits on Aug 8, 2012
  1. @rafaelfranca

    Fix CHANGELOG [ci skip]

    rafaelfranca committed Aug 8, 2012
Commits on Aug 7, 2012
  1. @rafaelfranca

    Remove references to old behavior with headers at

    ActionDispatch::Integration::ResquestHelpers.
    
    The behavior has removed at 4a6f4b9 to
    increase the compatibility with Rack::Test
    
    Closes #7136
    
    [ci skip]
    rafaelfranca committed Aug 7, 2012
  2. @rafaelfranca

    Merge pull request #7284 from josh/fix-asset-tests

    Fix asset integration test (3-2-stable)
    rafaelfranca committed Aug 7, 2012
  3. @josh

    Fix invalid asset compile assertions

    Logical paths to compile should require an extension
    josh committed Aug 7, 2012
  4. @tenderlove
  5. @dhh

    Merge pull request #7283 from josh/bump-sprockets

    Allow newer versions of Sprockets
    dhh committed Aug 7, 2012
  6. @josh
Commits on Aug 6, 2012
  1. @rafaelfranca
  2. @tenderlove @rafaelfranca

    Merge pull request #5872 from evtuhovich/prepared_statement_fix

    Remove prepared statement from system query in postgresql adapter
    Conflicts:
    	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
    tenderlove committed with rafaelfranca May 25, 2012
  3. @josevalim @rafaelfranca

    Merge pull request #7167 from route/missed_extend

    Missed extend for eager_autoload
    
    This backport is trying to fix a bug with eager load
    ActiveRecord::Associations modules
    josevalim committed with rafaelfranca Jul 26, 2012
  4. @rafaelfranca

    Merge pull request #7276 from sikachu/3-2-stable-js-include-tag-fix

    Do not include application.js if it doesn't exists
    rafaelfranca committed Aug 6, 2012
  5. @sikachu
  6. @sikachu

    Do not include application.js if it doesn't exists

    Rails were including 'application.js' to the pack when using
    `javascript_include_tag :all` even there's no application.js in the
    public directory.
    sikachu committed Aug 6, 2012
Commits on Aug 5, 2012
  1. @rafaelfranca

    Merge pull request #7140 from seamusabshere/patch-1

    Make sure :environment task is executed before db:schema:load or
    db:structure:load
    
    Conflicts:
    	activerecord/CHANGELOG.md
    rafaelfranca committed Aug 5, 2012
  2. @rafaelfranca

    Revert "Merge pull request #6084 from brainopia/support_for_magic_dom…

    …ain_on_all_stores"
    
    This reverts commit 393c652.
    
    This commit was supposed to fix a bug but it add more failures.
    rafaelfranca committed Aug 5, 2012
Commits on Aug 3, 2012
  1. @spastorino

    Bump to 3.2.8.rc2

    spastorino committed Aug 3, 2012
  2. @spastorino

    Add CHANGELOG entry

    spastorino committed Aug 3, 2012
  3. @josevalim @rafaelfranca

    Merge pull request #6084 from brainopia/support_for_magic_domain_on_a…

    …ll_stores
    
    Support cookie jar options for all cookie stores
    josevalim committed with rafaelfranca Apr 30, 2012
Commits on Aug 2, 2012
  1. @rafaelfranca @spastorino

    More `:rails_env` cleanup.

    `Rails.env` already use development if ENV["RAILS_ENV"] is not present.
    rafaelfranca committed with spastorino Aug 2, 2012
  2. @rafaelfranca

    More `:rails_env` cleanup.

    `Rails.env` already use development if ENV["RAILS_ENV"] is not present.
    rafaelfranca committed Aug 2, 2012
  3. @rafaelfranca @spastorino
  4. @rafaelfranca
Something went wrong with that request. Please try again.