Permalink
Commits on Mar 28, 2012
  1. Cover one more case in auth_token and remote forms

    If embedding auth_token in remote forms is off and we
    pass a value for auth_token it should respect it.
    committed Mar 28, 2012
  2. config.action_view.embed_authenticity_token_in_remote_forms is true b…

    …y default
    
    Changed default value for `config.action_view.embed_authenticity_token_in_remote_forms`
    to `false`. This change breaks remote forms that need to work also without javascript,
    so if you need such behavior, you can either set it to `true` or explicitly pass
    `:authenticity_token => true` in form options
    committed Mar 28, 2012
  3. Added config.action_view.embed_authenticity_token_in_remote_forms

    There is a regression introduced in 16ee611, which breaks
    remote forms that should also work without javascript. This commit
    introduces config option that allows to configure this behavior
    defaulting to the old behavior (ie. include authenticity token
    in remote forms by default)
    
    Conflicts:
    
    	actionpack/CHANGELOG.md
    committed Mar 28, 2012
  4. Merge pull request #2528 from cesario/fix_2507

    Rails.initialized? can be called at any time without raising an exception [Closes #2507]
    josevalim committed Mar 28, 2012
  5. Merge pull request #5623 from Houdini/master

    Remove redundant variable from core_ext/hash/deep_dup.rb
    josevalim committed Mar 28, 2012
  6. Merge pull request #5616 from cbartlett/migration-indent

    Fix indenting in migration generator
    spastorino committed Mar 28, 2012
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. remove redundant variable

    Houdini committed Mar 27, 2012
  3. Rails.initialized? can be called at any time without raising an excep…

    …tion [Closes #2507]
    
    Changes:
    
    * `Rails.initialized=` has been removed
    * `Rails.initialized?` and `Rails.application.initialized?` are now
    * delegating to `MyApp::Application.initialized?`
    franckverrot committed Aug 15, 2011
  4. Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-ha…

    …ml-master
    
    Don't break Haml with textarea newline fix. (master)
    spastorino committed Mar 27, 2012
  5. 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
  6. 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 Aug 23, 2011
  7. add missing do [ci skip]

    vijaydev committed Mar 27, 2012
  8. Fix indenting in migration generator

        $ rails generate migration remove_foo_from_bars foo:string
    
    This currently generates:
    
          def up
            remove_column :bars, :foo
              end
    
    Fix it:
    
          def up
            remove_column :bars, :foo
          end
    cbartlett committed Mar 27, 2012
  9. 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
  10. Merge pull request #5499 from arunagw/remove_unused_code

    removed unused variables
    spastorino committed Mar 27, 2012
  11. 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 - https://github.com/kryzhovnik/rails_field_error_proc_bug_example
    kryzhovnik committed Mar 27, 2012
  12. 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.
    committed Mar 26, 2012
  13. Merge pull request #5609 from tjmcewan/master

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

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

    Remove "needless boolean casting"
    fxn committed Mar 27, 2012
  16. 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.
    committed Mar 27, 2012
  17. 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…

    …on-hash
    
    Cookie store session hash
    tenderlove committed Mar 26, 2012