Permalink
Commits on Mar 8, 2012
  1. Fix typo in isolated engine docs

    caius committed with vijaydev Mar 6, 2012
  2. typo

    Mik-die committed with vijaydev Mar 4, 2012
Commits on Mar 7, 2012
  1. Add tests to test that through associations are not readonly, and we …

    …can update the records we retrive from the association
    kuahyeow committed with NZKoz Mar 7, 2012
  2. Merge pull request #5316 from Jacobkg/master

    Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings
    josevalim committed Mar 7, 2012
Commits on Mar 6, 2012
  1. Use latest rack-cache.

    josevalim committed Mar 6, 2012
  2. Increasing minimum version of mail due to security vulnerability foun…

    …d in Mail 2.4.1 for sendmail or exim
    mikel committed Mar 6, 2012
  3. Merge pull request #5299 from sikachu/3-2-stable-fix-responder

    Always passing a respond block from to responder
    josevalim committed Mar 6, 2012
  4. Always passing a respond block from to responder

    We should let the responder to decide what to do with the given
    overridden response block, and not short circuit it.
    
    Fixes #5280
    sikachu committed Mar 6, 2012
Commits on Mar 5, 2012
  1. Merge pull request #5278 from rafaelfranca/fix-build-3-2

    [3-2-stable] Fix build
    NZKoz committed Mar 5, 2012
  2. Only add the whitelist_attributes option if ActiveRecord is present

    Conflicts:
    
    	railties/test/generators/app_generator_test.rb
    	railties/test/isolation/abstract_unit.rb
    rafaelfranca committed Mar 4, 2012
Commits on Mar 4, 2012
  1. Whitelist all attribute assignment by default.

    Change the default for newly generated applications to whitelist all attribute assignment.  Also update the generated model classes so users are reminded of the importance of attr_accessible.
    NZKoz committed Mar 4, 2012
  2. fix associations when using per class databases

    would get ConnectionNotEstablished error because it always tried to use
    ActiveRecord::Base's connection, even though it should be using the connection
    of the model whose context we're operating in
    larskanis committed with drogus Nov 22, 2011
Commits on Mar 3, 2012
  1. CSS fix for guides. Closing #5028 [ci skip]

    In Ubuntu Chrome, in the last lines of code blocks, the underscore isn't
    visible. Increasing the line height slightly seems to fix this. This
    problem doesn't exist in Firefox even on Ubuntu. Too lazy to test in
    any other OS-browser combo :)
    vijaydev committed Feb 14, 2012
Commits on Mar 2, 2012
  1. only log an error if there is a logger. fixes #5226

    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
    tenderlove committed Mar 2, 2012
  2. Add CHANGELOG entry

    spastorino committed Mar 2, 2012
  3. Stop SafeBuffer#clone_empty from issuing warnings

    Logic in clone_empty method was dealing with old @dirty variable, which
    has changed by @html_safe in this commit:
    139963c
    
    This was issuing a "not initialized variable" warning - related to:
    #5237
    
    The logic applied by this method is already handled by the [] override,
    so there is no need to reset the variable here.
    carlosantoniodasilva committed with drogus Mar 2, 2012
  4. revert setting NOT NULL constraints in add_timestamps

    Commit 3dbedd2 added NOT NULL constraints both to table
    creation and modification. For creation the new default
    makes sense, but the generic situation for changing a
    table is that there exist records. Those records have
    no creation or modification timestamps, and in the
    general case you don't even know them, so when updating
    a table these constraints are not going to work. See
    a bug report for this use case in #3334.
    fxn committed Mar 2, 2012
Commits on Mar 1, 2012
  1. Merge branch '3-2-2' into 3-2-stable

    * 3-2-2:
      bumping to 3.2.2
      Ensure [] respects the status of the buffer.
      Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare
      Merge pull request #5084 from johndouthat/patch-1
      updating RAILS_VERSION
      delete vulnerable AS::SafeBuffer#[]
      use AS::SafeBuffer#clone_empty for flushing the output_buffer
      add AS::SafeBuffer#clone_empty
      fix output safety issue with select options
    tenderlove committed Mar 1, 2012
  2. bumping to 3.2.2

    tenderlove committed Mar 1, 2012
  3. Merge branch '3-2-stable-security' into 3-2-2

    * 3-2-stable-security:
      Ensure [] respects the status of the buffer.
      delete vulnerable AS::SafeBuffer#[]
      use AS::SafeBuffer#clone_empty for flushing the output_buffer
      add AS::SafeBuffer#clone_empty
      fix output safety issue with select options
    tenderlove committed Mar 1, 2012