Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: 3-1-stable
Commits on Jan 23, 2012
  1. @pkondzior

    Fix ActiveModel::Errors#dup

    pkondzior authored committed
    Since ActiveModel::Errors instance keeps all error messages as hash
    we should duplicate this object as well.
    
    Previously ActiveModel::Errors was a subclass of ActiveSupport::OrderedHash,
    which results in different behavior on dup, this may result in regression for
    people relying on it.
    
    Because Rails 3.2 stills supports Ruby 1.8.7 in order to properly fix this
    regression we need to backport #initialize_dup.
Commits on Jan 21, 2012
  1. @guilleiguaran
Commits on Jan 16, 2012
  1. @guilleiguaran @vijaydev

    Mention how use config.assets.prefix to avoid conflicting with an exi…

    guilleiguaran authored vijaydev committed
    …sting "/assets" route
Commits on Jan 13, 2012
  1. @josevalim

    No AS::TestCase here.

    josevalim authored
  2. @josevalim
  3. @vijaydev

    Merge pull request #4442 from guilleiguaran/3-1-changelogs

    vijaydev authored
    Update actionpack changelog in 3-1-stable
  4. @guilleiguaran
Commits on Jan 12, 2012
  1. @vijaydev
  2. @spastorino

    Merge pull request #4418 from tomstuart/read-and-write-attribute-alia…

    spastorino authored
    …ses-3-1-stable
    
    #[] and #[]= are no longer interchangeable with #read_attribute and #write_attribute (3-1-stable)
  3. @tomstuart
  4. @tomstuart
  5. @tomstuart
Commits on Jan 11, 2012
  1. @spastorino

    Merge pull request #4412 from kennyj/fix_3743

    spastorino authored
    Fix GH #3743. We must specify an encoding in rdoc_option explicitly.
Commits on Jan 10, 2012
  1. Add ORIGINAL_FULLPATH to env

    authored
    This behaves similarly to REQUEST_URI, but
    we need to implement it on our own because
    REQUEST_URI is not reliable.
    
    Note that since PATH_INFO does not contain
    information about trailing question mark,
    this is not 100% accurate, for example
    `/foo?` will result in `/foo` in ORIGINAL_FULLPATH
Commits on Jan 3, 2012
  1. @spastorino
  2. @josevalim
Commits on Dec 31, 2011
  1. @josevalim

    Merge pull request #4244 from hsbt/upgrade-rack-dependency

    josevalim authored
    Upgrade rack dependency
  2. @hsbt

    upgrade rack-1.3.6

    hsbt authored
Commits on Dec 23, 2011
  1. @arunagw @vijaydev

    [docs] Added missing "}" fixes #4126

    arunagw authored vijaydev committed
Commits on Dec 22, 2011
  1. @tenderlove
  2. @tenderlove

    refactoring routing tests

    tenderlove authored
    Conflicts:
    
    	actionpack/test/controller/routing_test.rb
Commits on Dec 21, 2011
  1. @tenderlove

    adding tests for #4029

    tenderlove authored
Commits on Dec 20, 2011
  1. @spastorino

    Merge pull request #4074 from arunagw/doc_fix

    spastorino authored
    doc:rails fixed
  2. @arunagw
  3. @josevalim

    Merge pull request #4065 from guilleiguaran/fix-railties-tests

    josevalim authored
    Fix railties tests: I broke development.rb template during last merge
  4. @guilleiguaran
  5. @josevalim

    Merge pull request #4058 from guilleiguaran/asset-pipeline-fixes

    josevalim authored
    Backport multiple fixes for asset pipeline from master to 3-1-stable
  6. @guilleiguaran

    Skip assets groups if --skip-sprockets option is given

    guilleiguaran authored
    Conflicts:
    
    	railties/test/generators/app_generator_test.rb
  7. @guilleiguaran

    Clarify the default assets.precompile matcher behavior

    authored guilleiguaran committed
  8. @guilleiguaran

    Use ProcessedAsset#pathname in Sprockets helpers when debugging is on…

    guilleiguaran authored
    …. Closes #3333 #3348 #3361.
    
    Is wrong use ProcessedAsset#to_s since it returns the content of the file.
  9. @guilleiguaran

    Ensure that files that compile to js/css are not compiled by default …

    authored guilleiguaran committed
    …with `rake assets:precompile`
    
    This case was not tested and documentation was a bit confusing
    on that topic, so it was not obvious if current code
    works properly or not.
  10. @guilleiguaran

    Skip assets options in environments files when --skip-sprockets is used

    guilleiguaran authored
    Conflicts:
    
    	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
    	railties/test/generators/app_generator_test.rb
Something went wrong with that request. Please try again.