Permalink
Switch branches/tags
Commits on May 24, 2010
Commits on May 23, 2010
  1. Make use of safe_concat on TextHelper concat

    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
    spastorino committed with jeremy May 23, 2010
  2. Revert "Don't always mark the argument to #concat as HTML-safe."

    This reverts commit e53791f.
    jeremy committed May 23, 2010
  3. Don't incompatibly monkeypatch ERB.

    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
    nex3 committed with jeremy May 23, 2010
  4. Don't always mark the argument to #concat as HTML-safe.

    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
    nex3 committed with jeremy May 23, 2010
  5. Mark all raw HTML being concatted as HTML-safe.

    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
    nex3 committed with jeremy May 23, 2010
  6. Bump 2-3-stable to 2.3.7

    jeremy committed May 23, 2010
  7. 2.3.6 release

    jeremy committed May 23, 2010
  8. Remove miscommit from 57337cd

    jeremy committed May 23, 2010
Commits on May 22, 2010
  1. backporting beda2d4 for newer sqlite-ruby bindings

    Signed-off-by: Xavier Noria <fxn@hashref.com>
    tenderlove committed with fxn May 22, 2010
Commits on May 18, 2010
  1. Revert "Don't carry default value when changing column for a binary t…

    …ype on MySQL"
    
    Broke mysql tests.
    
    This reverts commit ddadcc7.
    
    Conflicts:
    
    	activerecord/test/cases/migration_test.rb
    
    [#3234 state:open]
    jeremy committed May 18, 2010
  2. make add_index and remove_index more resilient; new rename_index meth…

    …od; track database limits
    
    [#3452 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
    etiennebarrie committed with jeremy May 16, 2010
  3. Nested records (re: autosave) are now updated even when the intermedi…

    …ate parent record is unchanged [#4242]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    ianwhite committed with josevalim May 18, 2010
Commits on May 17, 2010
  1. method rename to fix a broken test

    fxn committed May 17, 2010
  2. Deprecate Array#rand in favor of Array#random_element [#4555 stated:c…

    …ommitted]
    
    Signed-off-by: Xavier Noria <fxn@hashref.com>
    rizwanreza committed with fxn May 16, 2010
Commits on May 16, 2010
  1. CI: bump rack to 1.1

    jeremy committed May 16, 2010
  2. Rack dependency bumped to 1.1.0, tests passing. [#3558 state:resolved]

    Signed-off-by: José Valim <jose.valim@gmail.com>
    rizwanreza committed with josevalim May 16, 2010
  3. Postgresql doesn't allow to change a string type column to a binary t…

    …ype. Skip this test for postgresql for now.
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    Wijnand committed with josevalim May 16, 2010
  4. Added assert_attribute_type to clean up GeneratedAttributeTest [#2377

    …state:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    jeffkreeftmeijer committed with josevalim May 16, 2010
  5. when we run rake rails:freeze:edge update the value of the "REVISION"…

    … file rather than creating a new file "REVISION_ce706..." each time [#1694 state:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    matthewrudy committed with josevalim Jan 5, 2009
  6. make fixture accessors private

    prevent to be run fixture accessor (e.g. test_foos for TestFoo model) as a test case
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    no6v committed with josevalim May 30, 2009
  7. Fix broken integration test in 2.x [#4565 state:resolved]

    Signed-off-by: José Valim <jose.valim@gmail.com>
    Neeraj Singh committed with josevalim May 10, 2010
  8. using :time_select when the attribute type is :time in the scaffold g…

    …enerator. [#2377 state:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    jeffkreeftmeijer committed with josevalim May 14, 2010
  9. Don't carry default value when changing column for a binary type on M…

    …ySQL [#3234 state:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    Elomar França committed with josevalim Sep 27, 2009
Commits on May 15, 2010
  1. docs + test for each_error

    [#3185 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
    lawrencepit committed with jeremy Sep 11, 2009
  2. make sure `as` is set before trying to build an #{as}_counter. [#2804

    …state:resolved]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
    jeffkreeftmeijer committed with jeremy May 15, 2010
  3. db:drop:all throws error when database does not exist [#2997 state:re…

    …solved]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
    Neeraj Singh committed with jeremy Apr 20, 2010
  4. partial counters with :as [#2804 state:resolved]

    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
    jeffkreeftmeijer committed with jeremy May 15, 2010