Permalink
Switch branches/tags
Commits on May 18, 2012
  1. Ensure that CollectionAssociation#replace returns proper target

    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.
    committed May 18, 2012
Commits on May 17, 2012
  1. Revert changes related to `bundle install` fixes in `rails new`

    Reverted changes:
      f3482a9 Fix tests in railties
      5904295 improve #6318
      aed906a prevent using already loaded Gemfile for 'bundle install'
    
    In order to fix this, we need a fix in bundler related to GEM_PATH,
    which will allow to run tests properly. I will get this changes back
    when it happens.
    committed May 17, 2012
  2. Merge pull request #2036 from Bodacious/tag_helper_data_fix

    TagHelper creates invalid data attributes when value is a BigDecimal
    rafaelfranca committed May 17, 2012
  3. Merge pull request #6238 from pwnall/pgsql_bytea_limit

    Postgresql doesn't accept limits on binary (bytea) columns.
    tenderlove committed May 17, 2012
  4. Merge pull request #6215 from erichmenge/fix_has_secure_password

    Fix has secure password
    tenderlove committed May 17, 2012
  5. Update actionpack/CHANGELOG.md

    josevalim committed May 17, 2012
  6. Merge pull request #6309 from steveklabnik/fix-2394

    Created a Raw handler for templates.
    josevalim committed May 17, 2012
  7. Created a Raw handler for templates.

    Fixes #2394
    steveklabnik committed May 14, 2012
  8. Merge pull request #6250 from iGEL/dont_destroy_readonly_models

    Don't allow to destroy readonly models
    tenderlove committed May 17, 2012
  9. Merge pull request #6365 from kennyj/fix_warning_20120518

    Fix warning: ambiguous first argument.
    tenderlove committed May 17, 2012
  10. Don't destroy readonly models

    iGEL committed May 10, 2012
  11. Merge pull request #6363 from markmcspadden/fix_duplicable_documentation

    Fix documentation around duplicable regarding Class and Module.
    vijaydev committed May 17, 2012
  12. Merge pull request #6351 from bogdan/callbacks

    AS::Callbacks remove useless code, improve performance
    josevalim committed May 17, 2012
  13. Merge pull request #6058 from RStankov/relation-from-to-accept-other-…

    …relation-objects
    
    Relation#from to accept other Relation objects
    jonleighton committed May 17, 2012
  14. Merge branch 'master' of github.com:lifo/docrails

    Conflicts:
    	activerecord/lib/active_record/core.rb
    vijaydev committed May 17, 2012
  15. Revert "Update docs in sqlite3 adapter"

    This reverts commit 8d7c38b.
    
    Reason: Lot of the additions aren't adding value.
    
    [ci skip]
    vijaydev committed May 17, 2012
  16. [getting started] generating routes manually was done as a learning

    exercise, fix typos
    radar committed May 17, 2012
  17. [getting started] dialog box is not automatic, is provided through jq…

    …uery_ujs, which is necessary to have in application layout
    radar committed May 17, 2012