Commits on Mar 27, 2012
  1. Merge pull request #5621 from rafaelfranca/fix-2492-master

    Fix label_tag to merge the options hash with the object hash
    jeremy committed Mar 27, 2012
  2. Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-ha…

    Don't break Haml with textarea newline fix. (master)
    spastorino committed Mar 27, 2012
  3. Don't break Haml with textarea newline fix.

    See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.)
    Also fix 6 more tests that didn't yet have the newline expectation.
    jcoleman committed Mar 27, 2012
  4. adds delegetion for eof? to AD::Http::UploadedFile

    if you want to read the file you may need to ask if there is something
    to read from
    jigfox committed with drogus Aug 23, 2011
  5. add missing do [ci skip]

    vijaydev committed Mar 27, 2012
  6. Revert "[ci skip] updated bin/rails code in Rails Initialization Proc…

    …ess guide"
    This reverts commit 7feec40.
    Reason: The guide had the contents of railties/bin/rails and I don't see
    any reason to change it.
    vijaydev committed Mar 27, 2012
  7. Merge pull request #5499 from arunagw/remove_unused_code

    removed unused variables
    spastorino committed Mar 27, 2012
  8. Fixing issue #2492 for master branch. ActionView::Base.field_error_pr…

    …oc doesn't call for label.
    objectify_options method should be applied to the proper options arg.
    See explanation and example of the bug -
    kryzhovnik committed Mar 27, 2012
  9. If partial is rendered in controller, grab format from template

    Previously `rendered_format` was set only based on mime types
    passed in Accept header, which was wrong if first type from
    Accept was different than rendered partial. The fix is to simply
    move setting rendered_format to the place where template
    is available and grab format from the template. If it fails
    we can fallback to formats passed by Accept header.
    drogus committed Mar 26, 2012
  10. Merge pull request #5609 from tjmcewan/master

    prevent returning a negative zero from number_with_precision
    josevalim committed Mar 27, 2012
  11. removed unused variables

    arunagw committed Mar 18, 2012
  12. Merge pull request #5582 from chendo/master

    Remove "needless boolean casting"
    fxn committed Mar 27, 2012
  13. Don't ignore non Enumerable values passed to sanitize (closes #5585)

    When someone accidentally passes a string to sanitize like:
    sanitize("<span>foo</span>", :tags => "b")
    there is no indication that it's the wrong way and span
    will not be removed.
    drogus committed Mar 27, 2012
  14. Merge pull request #2621 from icco/master

    Issue with schema dump
    tenderlove committed Mar 27, 2012
Commits on Mar 26, 2012
  1. Merge pull request #5601 from carlosantoniodasilva/cookie-store-sessi…

    Cookie store session hash
    tenderlove committed Mar 26, 2012
  2. Merge pull request #5331 from castlerock/remove_unused_require

    remove unused require from AS/core_ext/class/delegating_att.rb
    tenderlove committed Mar 26, 2012
  3. Merge pull request #5592 from nashby/fix-issue-5584

    String#titleize works properly with smart quotes
    drogus committed Mar 26, 2012
  4. Merge pull request #5561 from carlosantoniodasilva/form-builder-block…

    Properly deprecate the block argument in AV FormBuilder
    tenderlove committed Mar 26, 2012
  5. added shallow_prefix option description in documantation

    It is in response for confusion in issue #5301
    Lukasz Sarnacki committed Mar 26, 2012
  6. Missing generated query for pluck method.

    (and changed the use of true for a more database agnostic example).
    xuanxu committed Mar 26, 2012