Permalink
Switch branches/tags
Commits on Jul 25, 2011
  1. Merge pull request #2253 from dchelimsky/stringify-parameter-values-i…

    josevalim committed Jul 25, 2011
    …n-tests-branched-off-3-1-stable
    
    Stringify parameter values in tests branched off 3-1-stable
Commits on Jul 24, 2011
  1. Update guide to be based on Rails 3.1.

    jasonnoble authored and fxn committed Jul 24, 2011
  2. Added link to the RubyGems User's Guide

    jasonnoble authored and fxn committed Jul 24, 2011
  3. Added explanation to Components of Rails to help users not get hung u…

    jasonnoble authored and fxn committed Jul 24, 2011
    …p on details
  4. Update "Getting Started" for Rails 3.1

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

    mikehoward authored and fxn 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 authored and fxn committed Jul 24, 2011
    relationship.
    
    changed wording 'one table ... corresponds to one model' to 'each table
    ...'
  7. 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.
  8. Missed a few instances of British English spelling in the last commit

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

    oem authored and fxn committed Jul 24, 2011
    …h English to
    
    American English(according to Weber)
    
    Conflicts:
    
    	actionpack/lib/action_controller/metal/request_forgery_protection.rb
    	railties/lib/rails/engine.rb
  10. Changing Textile emphasis underscores to em tags; the link with under…

    carols10cents authored and fxn committed Jul 23, 2011
    …scores that follows is causing the emphasis underscores to be parsed incorrectly.
    
    This appears to be a bug with RedCloth; parsing with official Textile creates the HTML that I expect. I have filed ticket # 226 on RedCloth's lighthouse project and I will attempt to fix the problem with RedCloth.
    
    This commit is a workaround for the RedCloth bug that will give this guide the right formatting.
  11. Replaced ‘ with ' in the guides.

    evanfarrar authored and fxn committed Jul 23, 2011
  12. now the documentation reflects the actual returned value for a missin…

    gnagno authored and fxn committed Jul 23, 2011
    …g translation
  13. Merge pull request #2235 from arunagw/location_var_fix_cherry-pick

    spastorino committed Jul 24, 2011
    Location var fix cherry pick from master to 3-1-stable
  14. Merge pull request #2229 from gramos/fix-issue-1951

    tenderlove committed Jul 24, 2011
    Fix issue 1951 Namespaced model partial_path is wrong in namespaced controllers
  15. Simple fix to the NoMethodError noted in #2177.

    Empact authored and tenderlove 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.
  16. - added ActionView::PartialRenderer#merge_path_into_partial(path, par…

    gramos committed Jul 23, 2011
    …tial)
    
      fix issues/1951
Commits on Jul 23, 2011
  1. Revert "Merge pull request #2194 from cldwalker/after_initialize"

    spastorino committed Jul 23, 2011
    This reverts commit 1983007, reversing
    changes made to ae65c0b.
  2. - added test case for issue:

    gramos committed Jul 23, 2011
      #1951
      Namespaced model partial_path is wrong in namespaced controllers
  3. Merge pull request #2194 from cldwalker/after_initialize

    spastorino committed Jul 23, 2011
    Fix after_initialize and Base.create edge case
  4. Merge pull request #2219 from kommen/fix_fragment_caching_squashed

    spastorino committed Jul 23, 2011
    Fix fragment caching (squashed commits)