Permalink
Switch branches/tags
Commits on Jul 24, 2011
  1. Merge pull request #2238 from cesario/order-with-extra-spaces

    tenderlove committed Jul 24, 2011
    Ordering with extra spaces was raising a SQL exception
  2. Merge pull request #2243 from dmathieu/comment

    fxn committed Jul 24, 2011
    Help the next guy with explanations - See bb3b3e3
  3. Merge branch 'master' of https://github.com/lifo/docrails

    Ken Ip Ken Ip
    Ken Ip authored and Ken Ip committed Jul 24, 2011
  4. Update "Getting Started" for Rails 3.1

    Ken Ip Ken Ip
    Ken Ip authored and Ken Ip committed Jul 24, 2011
    Add additional files generated by rails 3.1 generator.
  5. Clarified notes in 3.2 Creating the Blog Application

    mikehoward committed Jul 24, 2011
    Changed descriptino of Gemfile to add reference to Bundler
    Changed description of README to add 'You should edit ...'
    Changed description of Rakefile to reflect dynamic nature of Rakefile
    and point to app/lib/tasks/ as the place to add app-specific rake tasks.
  6. Changed wording of paragraph 2.1.1 Models to clarify table/model

    mikehoward committed Jul 24, 2011
    relationship.
    
    changed wording 'one table ... corresponds to one model' to 'each table
    ...'
  7. Merge pull request #1186 from mitijain123/duplicable_test

    spastorino committed Jul 24, 2011
    Duplicable test is looking fine now.
  8. Merge pull request #2239 from castlerock/scaffold_jquery

    spastorino committed Jul 24, 2011
    fixing broken test as jquery-rails is included in application.js
  9. Revert "Tests now require MySQL2 adapter in order to run"

    fxn committed Jul 24, 2011
    Reason: Setting up MySQL and Postgres needs installing servers
    and libraries that perhaps you don't need in your machine. We
    think fixing a bug in Active Support without running the suite
    of Active Record for all possible drivers is OK. That's why
    we explain first --without db, and after that we cover AR
    specifically. mysql2 is no different than mysql or pg in that
    sense.
    
    This reverts commit 50d5e0f.
  10. Missed a few instances of British English spelling in the last commit

    oem committed Jul 24, 2011
    oh and obviously I meant according to Webster, not Weber
  11. Changed a few instances of of words in the API docs written in Britis…

    oem committed Jul 24, 2011
    …h English to
    
    American English(according to Weber)
  12. Merge pull request #2233 from gramos/fix-issue-1951-master

    tenderlove committed Jul 24, 2011
    Fix issue 1951 master Namespaced model partial_path is wrong in namespaced controllers
  13. - added ActionView::PartialRenderer#merge_path_into_partial(path, par…

    gramos committed Jul 23, 2011
    …tial)
    
      fix issues/1951
  14. - added test case for issue:

    gramos committed Jul 23, 2011
      rails#1951
      Namespaced model partial_path is wrong in namespaced controllers
  15. Merge pull request #2185 from castlerock/lazy_load_abstract_adapter

    tenderlove committed Jul 24, 2011
    lazy load ConnectionAdapters remove require.
  16. Merge pull request #2228 from Empact/helper_tags_in_mailers

    tenderlove committed Jul 24, 2011
    Simple fix to the NoMethodError noted in #2177.
  17. Merge pull request #2226 from dmathieu/perform_caching

    tenderlove committed Jul 24, 2011
    rake assets:precompile should always perform caching - Closes #2199
  18. Simple fix to the NoMethodError noted in #2177.

    Empact committed Jul 24, 2011
    Unfortunately #respond_to?(:controller) won't work as suggested, nor will respond_to?(:params), as #controller is present and #params is delegated to #controller. #delegate makes respond_to? return true regardless whether the target responds to it.
Commits on Jul 23, 2011