Permalink
Commits on Jun 30, 2010
  1. @jberkel @josevalim

    Backported patch from [#4762]

    URL fragments should not have safe characters escaped. Ref: Appendix A,
      http://tools.ietf.org/rfc/rfc3986.txt
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    jberkel committed with josevalim Jun 29, 2010
Commits on Jun 29, 2010
  1. @tenderlove @jeremy

    AssociationCollection#create_by_*, find_or_create_by_* work properly …

    …now. [#1108 state:resolved]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
    tenderlove committed with jeremy Jun 29, 2010
  2. @texel @josevalim

    Rewrite the clause to pluck the existing value from zones_map before …

    …performing a lookup. [#4942 state:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    texel committed with josevalim Jun 28, 2010
  3. @dtrasbo @josevalim

    Deprecate ActiveRecord::Base#class_name [#379 state:committed]

    Signed-off-by: José Valim <jose.valim@gmail.com>
    dtrasbo committed with josevalim Jun 29, 2010
  4. @dtrasbo @josevalim

    Only tell users that the Rails gem is missing if it's actually the ca…

    …se [#2901 state:committed]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    dtrasbo committed with josevalim Jun 29, 2010
  5. @sikachu @josevalim

    Fix [54a5088] where the i18n gem was wrongly updated to 0.4.1.

    I've tested and confirm that `2-3-stable` will use the vendored `i18n` gem if there's no `i18n` gem with version >= 0.4.1 installed
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    sikachu committed with josevalim Jun 29, 2010
Commits on Jun 28, 2010
  1. @texel @josevalim

    test that unknown zones don't store mapping keys

    [#4942]
    
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
    Signed-off-by: José Valim <jose.valim@gmail.com>
    texel committed with josevalim Jun 28, 2010
  2. @spastorino @josevalim

    Don't store incorrect values in zones_map backport

    [#4942 state:committed]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    spastorino committed with josevalim Jun 28, 2010
Commits on Jun 27, 2010
  1. @dolzenko @josevalim

    Add module_eval missing file_name and line_number args

    [#4712 state:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    dolzenko committed with josevalim May 27, 2010
Commits on Jun 26, 2010
  1. @josevalim

    Tidy up tests in previous commit since they did not assure an Ordered…

    …Hash is returned (the test would pass for an array and would pass by chance for hashes).
    
    [#4875 state:resolved]
    josevalim committed Jun 26, 2010
  2. @chaitanyav @josevalim

    Add OrderedHash#invert to preserve order in ruby 1.8

    Signed-off-by: José Valim <jose.valim@gmail.com>
    chaitanyav committed with josevalim Jun 26, 2010
Commits on Jun 25, 2010
  1. @mudge @jeremy

    Alias ActiveSupport::OrderedHash#update to ActiveSupport::OrderedHash…

    ….merge!
    
    This ensures that an OrderedHash's keys are set up appropriately when using update.
    
    [#4973 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
    mudge committed with jeremy Jun 25, 2010
  2. @sikachu @josevalim

    Make sure that Rails doesn't resent session_id cookie over and over a…

    …gain if it's already there [#2485 state:resolved]
    
    This apply to only Active Record store and Memcached store, as they both store only the session_id, which will be unchanged, in the cookie.
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    sikachu committed with josevalim Jun 24, 2010
Commits on Jun 23, 2010
  1. @fxn

    deprecates load_(once_)paths in dependencies and app config in favor …

    …of autolaod_(once_)paths
    fxn committed Jun 23, 2010
  2. @josevalim
  3. @josevalim

    fixes to the tests for patch #4909

    Signed-off-by: José Valim <jose.valim@gmail.com>
    Neeraj Singh committed with josevalim Jun 23, 2010
  4. @josevalim

    quote scoped columns in validates_uniqueness_of [#4909 state:resolved]

    Signed-off-by: José Valim <jose.valim@gmail.com>
    kane committed with josevalim Jun 23, 2010
  5. @harking @josevalim

    Fixes #2415 by creating a new instance of the Model when saving attri…

    …butes to that model and the associated attributes already exist. Tests included. [#2415 state:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    harking committed with josevalim Jun 23, 2010
  6. @josevalim

    Fragment cache not generating the proper cache key in log

    [#4827 state:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    Neeraj Singh committed with josevalim Jun 13, 2010
  7. @maxim @josevalim

    Fix eager loading of polymorphic has_one associations nested-included…

    … under polymorphic belongs_to associations. [#3233 state:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    maxim committed with josevalim Jun 1, 2010
  8. @josevalim

    test for #1570

    Signed-off-by: José Valim <jose.valim@gmail.com>
    Neeraj Singh committed with josevalim Jun 23, 2010
  9. @josevalim

    STI should identify itself inside named_scope

    [#1570 state:resovled]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    Paweł Kondzior committed with josevalim Jun 23, 2010
  10. @NZKoz

    Revert "make text_field and hidden_field omit the value attribute if …

    …the developer explicitly passes in :value => nil [#4839 state:reopened]"
    
    This reverts commit 52c922f
    NZKoz committed Jun 23, 2010
  11. @NZKoz

    make text_field and hidden_field omit the value attribute if the deve…

    …loper explicitly passes in :value => nil [#4839 state:resolved]
    
    Signed-off-by: Michael Koziarski <michael@koziarski.com>
    
    Conflicts:
    
    	actionpack/lib/action_view/helpers/form_helper.rb
    NZKoz committed Jun 23, 2010
  12. @zilkey @NZKoz

    remove_column should raise an ArgumentError when no columns are passed [

    #4803 state:resolved]
    
    Signed-off-by: Michael Koziarski <michael@koziarski.com>
    zilkey committed with NZKoz Jun 9, 2010
Commits on Jun 22, 2010
  1. @jeremy

    CI: add i18n gem

    jeremy committed Jun 22, 2010
  2. @jstorimer @jeremy

    CookieStore should preserve the Set-Cookie header Array [#4743 state:…

    …resolved]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
    jstorimer committed with jeremy Jun 1, 2010
Commits on Jun 20, 2010
  1. @sikachu @josevalim

    Change all i18n interpolations from {{...}} to %{...}

    This will silent all warning if there's a i18n version 0.4.x gem install on user's machine.
    
    [#4913 state:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    sikachu committed with josevalim Jun 20, 2010
  2. @sikachu @josevalim

    Update bundled i18n gem to 0.4.1 to make sure every project will be w…

    …arn about using deprecated %{..} interpolation.
    
    This will also make sure that by changing {{..}} into %{..} won't break any Rails 2.3.x application, since it would load the vendored version if it's not satisfy the version requirement.
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    sikachu committed with josevalim Jun 20, 2010
Commits on Jun 19, 2010
  1. @chewi @josevalim

    When not overwriting unsaved updates in nested attributes, allow alre…

    …ady-saved records to be refreshed.
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    chewi committed with josevalim Jun 12, 2010
  2. @jeremy

    Fix Yajl backend discovery in ActiveSupport::JSON

    [#4897]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
    Maxime RETY committed with jeremy Jun 18, 2010
Commits on Jun 18, 2010
  1. @MasterLambaster @jeremy

    Fix test which prevents connection reset on failing and remove hardco…

    …ded connection
    
    [#4689 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
    MasterLambaster committed with jeremy May 25, 2010
Commits on Jun 9, 2010
  1. @lifo

    Fix AR perf script

    lifo committed Jun 9, 2010
  2. @chewi @lifo

    Don't overwrite unsaved updates when loading an association but prese…

    …rve the order of the loaded records. [#4642 state:resolved]
    
    Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
    chewi committed with lifo Jun 9, 2010
Commits on Jun 8, 2010
  1. @sikachu @josevalim

    Make sure that rails recognized the full notation of IPv6 loopback ad…

    …dress, and recognize 127.0.0.0/8 in IPv4
    
    [#3257 state:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    sikachu committed with josevalim Jun 6, 2010