Permalink
Commits on Mar 2, 2012
  1. Optimize url helpers.

    josevalim committed Mar 2, 2012
  2. Optimize path helpers.

    josevalim committed Mar 2, 2012
  3. revert setting NOT NULL constraints in add_timestamps

    fxn committed Mar 2, 2012
    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.
Commits on Mar 1, 2012
  1. Merge pull request #5232 from claudiob/add_release_date_to_docs

    vijaydev committed Mar 1, 2012
    Add release dates to documentation
  2. Add release dates to documentation

    claudiob committed Mar 1, 2012
    Set "March 1, 2012" as the release date for 3.2.2, 3.1.4, 3.0.12
  3. Merge branch 'master-security'

    tenderlove committed Mar 1, 2012
    * master-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
    
    Conflicts:
    	actionpack/lib/action_view/helpers/tags/base.rb
  4. Tap, tap goes the middleware

    jeremy committed Mar 1, 2012
Commits on Feb 29, 2012
  1. Merge pull request #5203 from avakhov/anonymous-controller-layout

    tenderlove committed Feb 29, 2012
    Fix layout lookup for anonymous controller
  2. Merge pull request #5219 from mattfawcett/2781-fix-querystring-route-…

    tenderlove committed Feb 29, 2012
    …constraint-for-testing
    
    Fix for #2781
  3. fix api doc [ci skip]

    vijaydev committed Feb 29, 2012
  4. adds a nodoc [ci skip]

    vijaydev committed Feb 29, 2012
    We have an empty api doc page otherwise :)
  5. Merge pull request #5221 from kennyj/fix_warning_20120301

    jeremy committed Feb 29, 2012
    Fix warning: assigned but unused variable
  6. Merge pull request #5214 from bdurand/fix_session_cache_store_require

    jeremy committed Feb 29, 2012
    remove unnecessary memcache require in ActionDispatch CacheStore
  7. remove unnecessary memcache equire in ActionDispatch::Session::CacheS…

    Brian Durand committed Feb 29, 2012
    …tore
Commits on Feb 28, 2012
  1. Merge pull request #5212 from MarkMT/master

    fxn committed Feb 28, 2012
    update_only documentation for accepts_nested_attributes_for
  2. Merge pull request #5208 from ysoslow/ef79b8400f064361b2dbe1ee89f42d2…

    tenderlove committed Feb 28, 2012
    …adc103a3c
    
    Inject in constantize
  3. Merge pull request #5196 from lest/patch-3

    josevalim committed Feb 28, 2012
    force datetime attributes to be changed, fix GH #3965
  4. minor edits [ci skip]

    vijaydev committed Feb 28, 2012
  5. copy edits [ci skip]

    vijaydev committed Feb 28, 2012
  6. Merge pull request #4284 from mattdbridges/time_calculation_aliases

    fxn committed Feb 28, 2012
    Added aliases for prev_year, prev_month, and prev_week in Time and Date calculations
  7. Merge pull request #5199 from gabehollombe/master

    fxn committed Feb 28, 2012
    The language for describing how to configure ActionController::Base.asset_host could be clearer
  8. Merge pull request #5197 from lest/patch-4

    josevalim committed Feb 28, 2012
    remove unnecessary code
  9. Revert "only mutate the scope object in the `bind` method"

    tenderlove committed Feb 28, 2012
    This reverts commit 1b9e19c.
Commits on Feb 27, 2012
  1. remove unnecessary code

    lest committed Feb 27, 2012
    it was added in 36129f2
    but isn't useful anymore as corresponding tests pass without it