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

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

    josevalim committed Mar 2, 2012
  3. 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 pull request #5232 from claudiob/add_release_date_to_docs

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

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

    * 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
    tenderlove committed Mar 1, 2012
  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

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

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

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

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

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

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

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

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

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

    force datetime attributes to be changed, fix GH #3965
    josevalim committed Feb 28, 2012
  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

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

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

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

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

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