Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on May 17, 2012
  1. @rafaelfranca

    Merge pull request #6371 from ihid/remove_old_text_helper_api

    rafaelfranca authored
    Removed old text_helper apis for highlight, excerpt and word_wrap
  2. @iHiD
  3. @jeremy

    Fix incorrect assert_block -> assert conversion. Assumed too much fro…

    jeremy authored
    …m the MiniTest deprecation message.
  4. @drogus

    Revert changes related to `bundle install` fixes in `rails new`

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

    Merge pull request #2036 from Bodacious/tag_helper_data_fix

    rafaelfranca authored
    TagHelper creates invalid data attributes when value is a BigDecimal
  6. @tenderlove

    Merge pull request #6238 from pwnall/pgsql_bytea_limit

    tenderlove authored
    Postgresql doesn't accept limits on binary (bytea) columns.
  7. @jeremy
  8. @tenderlove

    Merge pull request #6215 from erichmenge/fix_has_secure_password

    tenderlove authored
    Fix has secure password
  9. @josevalim
  10. @josevalim

    Merge pull request #6309 from steveklabnik/fix-2394

    josevalim authored
    Created a Raw handler for templates.
  11. @Bodacious
  12. @steveklabnik
  13. @tenderlove

    Merge pull request #6250 from iGEL/dont_destroy_readonly_models

    tenderlove authored
    Don't allow to destroy readonly models
  14. @rafaelfranca
  15. @tenderlove

    Merge pull request #6365 from kennyj/fix_warning_20120518

    tenderlove authored
    Fix warning: ambiguous first argument.
  16. @iGEL

    Don't destroy readonly models

    iGEL authored
  17. @kennyj
  18. @vijaydev

    Merge pull request #6363 from markmcspadden/fix_duplicable_documentation

    vijaydev authored
    Fix documentation around duplicable regarding Class and Module.
  19. @markmcspadden
  20. @josevalim

    Merge pull request #6351 from bogdan/callbacks

    josevalim authored
    AS::Callbacks remove useless code, improve performance
  21. @jonleighton

    Merge pull request #6058 from RStankov/relation-from-to-accept-other-…

    jonleighton authored
    …relation-objects
    
    Relation#from to accept other Relation objects
  22. @vijaydev

    Merge branch 'master' of github.com:lifo/docrails

    vijaydev authored
    Conflicts:
    	activerecord/lib/active_record/core.rb
  23. @vijaydev
  24. @vijaydev
  25. @vijaydev
  26. @vijaydev

    Revert "Update docs in sqlite3 adapter"

    vijaydev authored
    This reverts commit 8d7c38b.
    
    Reason: Lot of the additions aren't adding value.
    
    [ci skip]
  27. @radar
  28. @radar
  29. @radar
  30. @radar
  31. @radar
  32. @radar
  33. @radar
  34. @radar

    [getting started] dialog box is not automatic, is provided through jq…

    radar authored
    …uery_ujs, which is necessary to have in application layout
  35. @radar
Something went wrong with that request. Please try again.