Permalink
Switch branches/tags
Commits on May 8, 2010
  1. Add index length support for MySQL [#1852 state:resolved]

    eparreno authored and lifo committed May 8, 2010
    Example:
    
      add_index(:accounts, :name, :name => 'by_name', :length => 10)
      => CREATE INDEX by_name ON accounts(name(10))
    
      add_index(:accounts, [:name, :surname], :name => 'by_name_surname', :length => {:name => 10, :surname => 15})
      => CREATE INDEX by_name_surname ON accounts(name(10), surname(15))
    
    Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Commits on May 7, 2010
  1. Make find_or_create and find_or_initialize work mixing explicit param…

    spastorino authored and jeremy committed May 7, 2010
    …eters and a hash. ht: Marc-André Lafortune
    
    [#4457 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  2. simple_format should return html_safe but not escape text, that's for…

    spastorino authored and jeremy committed May 7, 2010
    … rails_xss plugin [#3767 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Commits on May 4, 2010
  1. add support for mysql2 adapter to dbconsole

    brianmario authored and jeremy committed May 4, 2010
    [#4532 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  2. Use primary key in conditions, not 'id' [#4395 state:resolved]

    lifo committed May 4, 2010
    Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
    
    Conflicts:
    
    	activerecord/test/cases/nested_attributes_test.rb
  3. AR JSON Serializer now supports custom root option.

    rubymerchant authored and jeremy committed Apr 30, 2010
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  4. Allow pre-casted values (other than nil) to pass through from calcula…

    brianmario authored and jeremy committed May 4, 2010
    …tions un-touched
    
    [#4514 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Commits on May 1, 2010
  1. repair the activesupport message encryptor tests for me, do so in the…

    marius authored and jeremy committed May 1, 2010
    … same way as jeremy did with message verifier
    
    [#4517 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Commits on Apr 29, 2010
  1. making rake:migrate VERSION=0 a noop called in succession. [#2137 sta…

    Neeraj Singh authored and josevalim committed Apr 20, 2010
    …te:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
Commits on Apr 28, 2010
  1. Destroy respects optimistic locking.

    cghawthorne authored and jeremy committed Feb 22, 2010
    Now works with :dependent => :destroy and includes unit tests for that
    case.  Also includes better error messages when updating/deleting stale
    objects.
    
    [#1966 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Commits on Apr 26, 2010
  1. Add ActiveResource::Base.include_root_in_json, like Active Record, to…

    Joe Martinez authored and jeremy committed Apr 26, 2010
    … serialize instances as hash of model name -> attributes hash rather than the bare attributes hash. [#2584 state:committed]
    
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Commits on Apr 25, 2010
  1. actionpack: added missing encoding comments [#4466 state:resolved]

    e2 authored and jeremy committed Apr 24, 2010
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  2. Expect an incompatible encoding exception when a template with a magi…

    jeremy committed Apr 9, 2010
    …c comment renders a partial without one and its source encoding doesn't match the default external encoding
  3. Expect an incompatible encoding exception when a template doesn't hav…

    jeremy committed Apr 9, 2010
    …e a magic comment and its source encoding doesn't match the default external encoding
Commits on Apr 24, 2010
  1. Remove quoted_string_prefix entirely since PostgreSQL was the only da…

    jeremy committed Apr 24, 2010
    …tabase adapter relying on it.
  2. PostgreSQL adapter: escape_bytea, quote_string and unescape_bytea are…

    libc authored and jeremy committed Sep 20, 2009
    …n't thread-safe in Ruby 1.8 [#3237 state:resolved]
    
    Signed-off-by: wycats <wycats@gmail.com>
Commits on Apr 22, 2010
  1. Is not nessesary to have @_rails_html_safe instance var when the stri…

    Sam Elliott and Santiago Pastorino authored and NZKoz committed Apr 22, 2010
    …ng is unsafe, also it breaks to_yaml [#3535 state:committed]
Commits on Apr 21, 2010
  1. load tzinfo on initialize only

    spastorino authored and fxn committed Apr 21, 2010
    Signed-off-by: Xavier Noria <fxn@hashref.com>
  2. TimeZones lazy load

    spastorino authored and jeremy committed Apr 20, 2010
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Commits on Apr 19, 2010
Commits on Apr 17, 2010
  1. `String#starts/ends_with?` should return false for non-string argumen…

    mislav authored and jeremy committed Apr 17, 2010
    …t, not raise error
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Commits on Apr 16, 2010
  1. ruby 1.8.7 compat: `starts/ends_with?` doesn't cast to string

    mislav authored and jeremy committed Sep 14, 2009
    `starts/ends_with?` methods shouldn't cast argument to string because
    ruby 1.8.7 doesn't seem to do that. for example:
    
        "foobar".ends_with?(:bar)
        # => true in ActiveSupport implementation, false in ruby 1.8.7
    
    [#3199 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Commits on Apr 15, 2010
  1. Implement find_in_batches without with_scope [#2227 state:resolved]

    libc authored and lifo committed Jul 2, 2009
    Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Commits on Apr 14, 2010