Skip to content
This repository
  • 804 commits
  • 256 files changed
  • 81 contributors
This comparison is big! We're only showing the most recent 250 commits
Mar 28, 2010
Santiago Pastorino Time marshalling backported [#4286 state:committed]
Signed-off-by: wycats <>
Santiago Pastorino flatten not needed here
Signed-off-by: wycats <>
Santiago Pastorino backport of inconsistency with cattr_reader and matter_reader with so…
…me tweaks

Signed-off-by: wycats <>
Mar 29, 2010
Andrew White Add the ability to specify table_name_prefix on individual modules
[#4032 state:committed]

Signed-off-by: Jeremy Kemper <>
Ernie Miller belongs_to associations now honor :primary_key option for joins
Signed-off-by: Jeremy Kemper <>
Joey Aghion use supplied primary key when eager-loading belongs_to associations r…
…ather than default primary key


Signed-off-by: Jeremy Kemper <>
Mar 30, 2010
Dudley Flanders Trivial doc update on nested attributes delete renaming
Signed-off-by: José Valim <>
Fixed a bug where create_table could not be called without a block [#…
…2221 state:resolved]

Signed-off-by: Pratik Naik <>
Juanjo Bazán new assertion: assert_blank
Signed-off-by: Xavier Noria <>
Juanjo Bazán New assertion: assert_present
Signed-off-by: Xavier Noria <>
Santiago Pastorino Don't cache the utc_offset we are already caching the timezone [#4301]
Signed-off-by: Jeremy Kemper <>
Xavier Noria avoid method redefined; discarding old empty? warning [Santiago Pasto…
Mar 31, 2010
Pratik Dont try to load the record from the db if preloading didn't find any…
Pratik Dont use Rails 3 finder syntax in Rails 2.3.x test [#4303 state:resol…
David Heinemeier Hansson Added Object#presence that returns the object if it's #present? other…
…wise returns nil [DHH/Colin Kelley]
Jeremy Kemper HTML safety: give a deprecation warning if an array of option tags is…
… passed to select tag. Be sure to join the tag yourself and mark them .html_safe
Apr 02, 2010
Santiago Pastorino utc_offset is no longer required on TimeZone and if it's not supplied…
… we delegate to TZInfo
Santiago Pastorino delegate unknown timezones to TZInfo 2c148cd
Jeremy Kemper CI: add tzinfo e2ec41a
Jeremy Kemper Adjust test in case tzinfo is not available 19161e0
Jeremy Kemper Check more carefully for vendored tzinfo a72bcdb
Apr 04, 2010
Andrew White Backport of lazy evaluation of has_many ..., :dependent => :___
[#2627 state:committed]

Signed-off-by: Jeremy Kemper <>
Parameterize should accept malformed utf8 characters [#4323 state:res…

Signed-off-by: Jeremy Kemper <>
Apr 06, 2010
Simon Effenberg remove_index now uses quote_table_name() [#4300 state:resolved]
Signed-off-by: Michael Koziarski <>
Santiago Pastorino Generate routes for nested resources with nil object raise RoutingErr…
…or [#4262 state:committed]

Signed-off-by: Jeremy Kemper <>
Apr 08, 2010
David Heinemeier Hansson Fixed that default locale templates should be used if the current loc…
…ale template is missing [DHH]
Apr 09, 2010
Rolf Bjaanes Changed the way inflections for uncountables work for 'funky jeans'
Signed-off-by: José Valim <>
José Valim Fix tests broken in 0653a6d f87a518
Santiago Pastorino fix stack trace lines on class_eval
Signed-off-by: José Valim <>
José Valim Fix a failure added on 958b0e9 4a02437
Jeremy Kemper CI: message for some outstanding failures 56c5290
Jeremy Kemper Refactor for readability efec9b2
Jeremy Kemper CI: show all headers for diagnosis d91d6fe
Jeremy Kemper Only set response etag if body is not blank 2cd29f4
Apr 10, 2010
hypothetical made error_message_on work by passing in the object name if there is …
…no object [#3246 state:resolved]

Signed-off-by: José Valim <>
Yaroslav Markin Fix Array#to_xml to produce valid markup when working with namespaced…
… classes [#3624 state:resolved]

Signed-off-by: José Valim <>
Apr 12, 2010
Anil Wadghule Fix for plugin not getting installed on Windows environment [#4320 st…

Signed-off-by: José Valim <>
Apr 14, 2010
Pratik Ensure not to load the entire association when bulk updating existing…
… records using nested attributes
Xavier Noria fix dash -> edit in an example, and a few touches now that we are here b8b568e
Apr 15, 2010
Eugene Pimenov Implement find_in_batches without with_scope [#2227 state:resolved]
Signed-off-by: Pratik Naik <>
Apr 16, 2010
Mislav Marohnić ruby 1.8.7 compat: `starts/ends_with?` doesn't cast to string
`starts/ends_with?` methods shouldn't cast argument to string because
ruby 1.8.7 doesn't seem to do that. for example:

    # => true in ActiveSupport implementation, false in ruby 1.8.7

[#3199 state:committed]

Signed-off-by: Jeremy Kemper <>
Jeremy Kemper Distinguish test for 1.8.6 compat c55cdd8
Apr 17, 2010
Mislav Marohnić cleanup `update/reset_counters`; refactor tests ef0591e
Mislav Marohnić fix `reset_counters` to work even with complex class names
e.g. it guesses that a belongs_to association to Namespace::MyModel is
named "my_model", unlike before where it would look up an association
named "namespace::mymodel" and fail.
Mislav Marohnić `String#starts/ends_with?` should return false for non-string argumen…
…t, not raise error

Signed-off-by: Jeremy Kemper <>
Jeremy Kemper Fix 1.9-specific syntax error in test 8b79c7c
Jeremy Kemper Upgrade bundled i18n from 1.3.3 to 1.3.7 fd5c6e2
Apr 19, 2010
Jeremy Kemper MemoryStore#read_multi(*keys) for dev-mode compatibility with memcach…
…e store
Apr 20, 2010
Santiago Pastorino TimeZones lazy load
Signed-off-by: Jeremy Kemper <>
Apr 21, 2010
Santiago Pastorino load tzinfo on initialize only
Signed-off-by: Xavier Noria <>
Apr 23, 2010
Is not nessesary to have @_rails_html_safe instance var when the stri…
…ng is unsafe, also it breaks to_yaml [#3535 state:committed]
Apr 24, 2010
Eugene Pimenov PostgreSQL adapter: escape_bytea, quote_string and unescape_bytea are…
…n't thread-safe in Ruby 1.8 [#3237 state:resolved]

Signed-off-by: wycats <>
Jeremy Kemper PostgreSQL: use standard-conforming strings if possible c9e1570
Jeremy Kemper PostgreSQL: remove the unnecessary heuristic checking whether the val…
…ue is escaped
Jeremy Kemper Remove quoted_string_prefix entirely since PostgreSQL was the only da…
…tabase adapter relying on it.
Jeremy Kemper Ruby 1.9: ERB template encoding using a magic comment at the top of t…
…he file
Jeremy Kemper Ensure ERB source begins with the encoding comment 70034d8
Akira Matsuda Fix pattern to match various magic comment formats 4082001
Jeremy Kemper Expect an incompatible encoding exception when a template doesn't hav…
…e a magic comment and its source encoding doesn't match the default external encoding
Jeremy Kemper Expect an incompatible encoding exception when a template with a magi…
…c comment renders a partial without one and its source encoding doesn't match the default external encoding
Cezary Baginski actionpack: added missing encoding comments [#4466 state:resolved]
Signed-off-by: Jeremy Kemper <>
Jeremy Kemper Fix unstated AS::Multibyte dependency 8716ee4
Jeremy Kemper Fix backport error: wrong exception name 9e262de
Apr 26, 2010
Add ActiveResource::Base.include_root_in_json, like Active Record, to…
… serialize instances as hash of model name -> attributes hash rather than the bare attributes hash. [#2584 state:committed]

Signed-off-by: Santiago Pastorino <>
Signed-off-by: Jeremy Kemper <>
Apr 27, 2010
Curtis Hawthorne Destroy respects optimistic locking.
Now works with :dependent => :destroy and includes unit tests for that
case.  Also includes better error messages when updating/deleting stale

[#1966 state:committed]

Signed-off-by: Jeremy Kemper <>
Apr 29, 2010
Neeraj Singh making rake:migrate VERSION=0 a noop called in succession. [#2137 sta…

Signed-off-by: José Valim <>
May 01, 2010
Marius Nuennerich repair the activesupport message encryptor tests for me, do so in the…
… same way as jeremy did with message verifier

[#4517 state:committed]

Signed-off-by: Jeremy Kemper <>
May 04, 2010
Pratik Use class_inheritable_accessor for connection_handler 04fa5af
Brian Lopez Allow pre-casted values (other than nil) to pass through from calcula…
…tions un-touched

[#4514 state:committed]

Signed-off-by: Jeremy Kemper <>
Jatinder Singh AR JSON Serializer now supports custom root option.
Signed-off-by: Jeremy Kemper <>
Pratik Use primary key in conditions, not 'id' [#4395 state:resolved]
Signed-off-by: Pratik Naik <>


Brian Lopez add support for mysql2 adapter to dbconsole
[#4532 state:committed]

Signed-off-by: Jeremy Kemper <>
May 07, 2010
Santiago Pastorino simple_format should return html_safe but not escape text, that's for…
… rails_xss plugin [#3767 state:committed]

Signed-off-by: Jeremy Kemper <>
Santiago Pastorino Make find_or_create and find_or_initialize work mixing explicit param…
…eters and a hash. ht: Marc-André Lafortune

[#4457 state:committed]

Signed-off-by: Jeremy Kemper <>
May 08, 2010
Emili Parreño Add index length support for MySQL [#1852 state:resolved]

  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 <>
Santiago Pastorino The intention here was to assign to different objects ht: Radar 555801c
Revert "Add index length support for MySQL [#1852 state:resolved]" (b…
…reaks the build)

This reverts commit 3616141.
May 09, 2010
Pratik Revert "Revert "Add index length support for MySQL [#1852 state:resol…
…ved]" (breaks the build)"

This reverts commit eababa3.
Pratik Make sure schema dumper doesnt throw up when there are no index lengths 3c1bb40
May 11, 2010
José Valim Remove i18n interpolation deprecation. It has been around since 2.2. 8e679f1
Santiago Pastorino type_cast_calculated_value refactor: value is never a Fixnum here. Fi…
…x test since SQLite returns Float.

[#4514 state:committed]

Signed-off-by: Jeremy Kemper <>
Jeremy Kemper Drop require removed by 8e679f1 9ab1154
May 12, 2010
Pratik Use superclass_delegating_accessor for connection handlers 7cbc546
Santiago Pastorino to_json and to_xml tests added to ActiveResource
[#4529 state:resolved]

Signed-off-by: Jeremy Kemper <>
May 14, 2010
José Valim Remove deprecated tests according to 8e679f1 6949d6f
May 15, 2010
Josh Kalderimis backported AR correction to find_each and find_in_batches to raise wh…
…en the user uses select but does not specify the primary key

Signed-off-by: José Valim <>
Jeff Kreeftmeijer partial counters with :as [#2804 state:resolved]
Signed-off-by: Jeremy Kemper <>
Neeraj Singh db:drop:all throws error when database does not exist [#2997 state:re…

Signed-off-by: Jeremy Kemper <>
Jeff Kreeftmeijer make sure `as` is set before trying to build an #{as}_counter. [#2804

Signed-off-by: Jeremy Kemper <>
Lawrence Pit docs + test for each_error
[#3185 state:committed]

Signed-off-by: Jeremy Kemper <>
May 16, 2010
Don't carry default value when changing column for a binary type on M…
…ySQL [#3234 state:resolved]

Signed-off-by: José Valim <>
Jeff Kreeftmeijer using :time_select when the attribute type is :time in the scaffold g…
…enerator. [#2377 state:resolved]

Signed-off-by: José Valim <>
Neeraj Singh Fix broken integration test in 2.x [#4565 state:resolved]
Signed-off-by: José Valim <>
Nobuhiro IMAI 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 <>
Matthew Rudy Jacobs 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 <>
Jeff Kreeftmeijer Added assert_attribute_type to clean up GeneratedAttributeTest [#2377

Signed-off-by: José Valim <>
Wijnand Wiersma 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 <>
Rizwan Reza Rack dependency bumped to 1.1.0, tests passing. [#3558 state:resolved]
Signed-off-by: José Valim <>
Jeremy Kemper CI: bump rack to 1.1 cd3d30d
May 17, 2010
José Valim superclass_delegating_accessor does not accept options. 76608b1
Rizwan Reza Deprecate Array#rand in favor of Array#random_element [#4555 stated:c…

Signed-off-by: Xavier Noria <>
May 18, 2010
Xavier Noria method rename to fix a broken test bb2327d
José Valim Deprecate legacy CGI options in SessionStores. 94878c6
Ian White Nested records (re: autosave) are now updated even when the intermedi…
…ate parent record is unchanged [#4242]

Signed-off-by: José Valim <>
Étienne Barrié 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 Kemper Revert "Don't carry default value when changing column for a binary t…
…ype on MySQL"

Broke mysql tests.

This reverts commit ddadcc7.



[#3234 state:open]
May 19, 2010
Xavier Noria 1.9 compat: deprecated last_(month|year) in favor of prev_(month|year) 25ec613
May 22, 2010
Aaron Patterson backporting beda2d4 for newer sqlite-ruby bindings
Signed-off-by: Xavier Noria <>
Jeremy Kemper Remove miscommit from 57337cd d8f0a58
Jeremy Kemper 2.3.6 release 56bb550
May 23, 2010
Jeremy Kemper Bump 2-3-stable to 2.3.7 55e88ee
Nathan Weizenbaum Mark all raw HTML being concatted as HTML-safe.
Signed-off-by: Jeremy Kemper <>
Nathan Weizenbaum Don't always mark the argument to #concat as HTML-safe.
Signed-off-by: Jeremy Kemper <>
Nathan Weizenbaum Don't incompatibly monkeypatch ERB.
Signed-off-by: Jeremy Kemper <>
Jeremy Kemper Fix test rendering unmarked but safe HTML ca5f5d9
Jeremy Kemper Use a non-XSS-protected output buffer for view tests ab2d7c8
Jeremy Kemper Revert "Don't always mark the argument to #concat as HTML-safe."
This reverts commit e53791f.
Santiago Pastorino Make use of safe_concat on TextHelper concat
Signed-off-by: Jeremy Kemper <>
Jeremy Kemper rails_xss handles deprecated String html safety, when installed 3ff921a
Jeremy Kemper Move tests for deprecated String#html_safe! to plugin 60e82a3
May 24, 2010
Jeremy Kemper 2.3.7 release: fix rails_xss compatibility 326188c
Jeremy Kemper Bump 2-3-stable to 2.3.8 f97da34
Mislav Marohnić auto_link: support arbitrary URI schemes like "ftp:" and "file:"
recognizes all URI scheme allowed characters, such as colon and period.

[#3494 state:resolved]
Mislav Marohnić avoid auto_linking already linked emails; more robust detection of li…
…nked URLs

References #1523  [#1862 state:resolved]  [#3591 state:resolved]

Add test that shows how link text can contain HTML if needed:
the trick is using block form in combination with `raw`.
Let link text be automatically HTML-escaped

[#2017 state:resolved]
Lance Ivy Ensure auto_link does not ignore multiple trailing punctuations
[#2504 state:resolved]
Jeremy Kemper Fix that captured content (e.g. with form_for or div_for) would be HT…
…ML-escaped even without the rails_xss plugin installed. Rails 2.3.7, we barely knew ya...
Yehuda Katz Give the ERB String the encoding of the original template 50b7c0c
Yehuda Katz Needs to work on 1.8 too 8e6a044
Santiago Pastorino Revert "translation method of TranslationHelper module returns always…
… SafeBuffer [#4194 status:resolved]"

This reverts commit 2310aef.

Signed-off-by: José Valim <>
Santiago Pastorino translation method of TranslationHelper module returns a SafeBuffer A…
…rray backport

[#4675 state:committed]

Signed-off-by: José Valim <>
Jeremy Kemper Work around strange Ruby 1.9 autoload issue by using absolute load pa…
…ths for tests
Jeremy Kemper Add global gem task e5af56a
Jeremy Kemper 2.3.7.pre1: fixes HTML escaping when *not* using rails_xss 4fef5af
Santiago Pastorino translate helper method using an array is deprecated
Signed-off-by: José Valim <>
José Valim Ensure translations work with symbols. 50f3754
Jeremy Kemper Work around strange Ruby 1.9 autoload issue by using absolute load pa…
…ths for tests (ditto for other components' tests)
Santiago Pastorino Error messages for asserts
Signed-off-by: Jeremy Kemper <>
Jeremy Kemper Work around strange Ruby 1.9 autoload issue by using absolute load pa…
…ths for tests (for Active Model too)
Jeremy Kemper HTML safety: fix textarea with nil content 6a9e188
Jeremy Kemper i18n: t() handles single keys returning an Array, also f7e27bd
Santiago Pastorino SQLite: forward compatibility with future driver releases

Signed-off-by: Jeremy Kemper <>
May 25, 2010
Xavier Noria get railties/README back to the home page of the API 2ed893b
Jeremy Kemper Bump 2-3-stable to 2.3.9 9da7ff8
Jeremy Kemper Shift SafeBuffer#concat responsibility over to rails_xss a815f0c
May 26, 2010
Santiago Pastorino removes an unneeded alias
Signed-off-by: José Valim <>
May 29, 2010
Michael Koziarski Merge commit 'mislav/auto_link_2-3-stable' into 2-3-stable 5796a92
Michael Koziarski Merge commit 'mislav/counter_cache_2-3-stable' into 2-3-stable b760d69
Don't rewrap system level exceptions with StatementInvalid
Signed-off-by: Michael Koziarski <>
[#896 state:committed]
Jun 05, 2010
Xavier Noria deprecates Array#random_element in favor of Array#sample, backported …
…from Ruby 1.9, thanks to Marc-Andre Lafortune
Jun 08, 2010
Prem Sichanugrist Make sure that rails recognized the full notation of IPv6 loopback ad…
…dress, and recognize in IPv4

[#3257 state:resolved]

Signed-off-by: José Valim <>
Jun 09, 2010
James Le Cuirot 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 <>
Jun 10, 2010
Pratik Fix AR perf script e4accde
Jun 18, 2010
Alex Fix test which prevents connection reset on failing and remove hardco…
…ded connection

[#4689 state:committed]

Signed-off-by: Jeremy Kemper <>
Fix Yajl backend discovery in ActiveSupport::JSON

Signed-off-by: Jeremy Kemper <>
Jun 20, 2010
James Le Cuirot When not overwriting unsaved updates in nested attributes, allow alre…
…ady-saved records to be refreshed.

Signed-off-by: José Valim <>
Jun 21, 2010
Prem Sichanugrist 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 <>
Prem Sichanugrist 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 <>
Jun 22, 2010
Jesse Storimer CookieStore should preserve the Set-Cookie header Array [#4743 state:…

Signed-off-by: Jeremy Kemper <>
Jeremy Kemper CI: add i18n gem e703fc1
Jun 23, 2010
Jeff Dean remove_column should raise an ArgumentError when no columns are passed [
#4803 state:resolved]

Signed-off-by: Michael Koziarski <>
Michael Koziarski 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 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
STI should identify itself inside named_scope
[#1570 state:resovled]

Signed-off-by: José Valim <>
Neeraj Singh test for #1570
Signed-off-by: José Valim <>
Maxim Chernyak aka hakunin Fix eager loading of polymorphic has_one associations nested-included…
… under polymorphic belongs_to associations. [#3233 state:resolved]

Signed-off-by: José Valim <>
Neeraj Singh Fragment cache not generating the proper cache key in log
[#4827 state:resolved]

Signed-off-by: José Valim <>
George Montana Harkin 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 <>
quote scoped columns in validates_uniqueness_of [#4909 state:resolved]
Signed-off-by: José Valim <>
Neeraj Singh fixes to the tests for patch #4909
Signed-off-by: José Valim <>
José Valim Use size for Ruby 1.8.6 compatibility. 68bfd8a
Jun 24, 2010
Xavier Noria deprecates load_(once_)paths in dependencies and app config in favor …
…of autolaod_(once_)paths
Jun 25, 2010
Prem Sichanugrist 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 <>
Paul Mucur Alias ActiveSupport::OrderedHash#update to ActiveSupport::OrderedHash…

This ensures that an OrderedHash's keys are set up appropriately when using update.

[#4973 state:committed]

Signed-off-by: Jeremy Kemper <>
Jun 26, 2010
NagaChaitanya Vellanki Add OrderedHash#invert to preserve order in ruby 1.8
Signed-off-by: José Valim <>
José Valim 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]
Jun 27, 2010
Evgeniy Dolzhenko Add module_eval missing file_name and line_number args
[#4712 state:resolved]

Signed-off-by: José Valim <>
Jun 28, 2010
Santiago Pastorino Don't store incorrect values in zones_map backport
[#4942 state:committed]

Signed-off-by: José Valim <>
Leigh Caplan test that unknown zones don't store mapping keys

Signed-off-by: Santiago Pastorino <>
Signed-off-by: José Valim <>
Jun 29, 2010
Prem Sichanugrist 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 <>
David Trasbo Only tell users that the Rails gem is missing if it's actually the ca…
…se [#2901 state:committed]

Signed-off-by: José Valim <>
David Trasbo Deprecate ActiveRecord::Base#class_name [#379 state:committed]
Signed-off-by: José Valim <>
Leigh Caplan Rewrite the clause to pluck the existing value from zones_map before …
…performing a lookup. [#4942 state:resolved]

Signed-off-by: José Valim <>
Aaron Patterson AssociationCollection#create_by_*, find_or_create_by_* work properly …
…now. [#1108 state:resolved]

Signed-off-by: Jeremy Kemper <>
Jun 30, 2010
Jan Berkel Backported patch from [#4762]
URL fragments should not have safe characters escaped. Ref: Appendix A,

Signed-off-by: José Valim <>
Jul 01, 2010
James Le Cuirot Don't remove scheduled destroys when loading an association.
Signed-off-by: José Valim <>
Aaron Patterson fisting Session::AbstractStore#clear to actually clear the session. [#…
…5030 state:resolved]

Signed-off-by: Jeremy Kemper <>
Jul 04, 2010
José Valim Use bind instead of instance_exec cause it may be causing memory leak…
…s. Also, provide a simpler and sane implementation for scoped. [#5044 state:resolved]
Jul 08, 2010
Mislav Marohnić add missing require to ActiveRecord "base_test.rb"
Signed-off-by: Jeremy Kemper <>
Mislav Marohnić test that ActiveRecord `destroy` and `destroy_all` return destroyed r…

Signed-off-by: Jeremy Kemper <>
Grant Ammons fixes #2362, eager loading :through associations will join the :sourc…
…e model if there are :conditions

Signed-off-by: José Valim <>
Ken Collins Fix the #using_limitable_reflections? helper to work correctly by not…
… examining the length of an array which contains false/true, hence always passing.

Signed-off-by: José Valim <>
Mike Breen A generated plugin's test are not run by 'rake test'
Signed-off-by: José Valim <>
Jul 14, 2010
Jacob Lewallen Set destroyed=true in opt locking's destroy [#5058 state:resolved]
Signed-off-by: José Valim <>
Michael Lovitt Sessions should not be created until written to and session data shou…
…ld be destroyed on reset. [#4938 state:resolved]

Signed-off-by: José Valim <>
Jul 15, 2010
Aaron Patterson fixing performance regression from 2.3.5 -> 2.3.8 7b6383f
Jul 16, 2010
Michael Koziarski Only skip eager loading the code if dependency_loading is still enabled.
Otherwise rake tasks which depend on environment will get errors about missing constants.
Aaron Patterson backporting a couple missing files. sorry folks! 4ae4828
Jul 17, 2010
Jon Yurek Fix for integration tests not serializing arrays in multipart forms c…

Signed-off-by: wycats <>
Aaron Patterson changing fixtures back to superclass_delegating_accessor until we can…
… convert them to class_attributes
Jul 18, 2010
Neeraj Singh update_attribute and updated_attributes! are now wrapped in a transac…

[#922 state:resolved]

Signed-off-by: José Valim <>
Subba Rao Pasupuleti renaming test name to fix accidently override [#5076 state:resolved]
Signed-off-by: José Valim <>
Jul 25, 2010
Santiago Pastorino Changes the usage of Object#returning with Object#tap
Signed-off-by: José Valim <>
Santiago Pastorino Deprecates Object#returning in favor of Object#tap
Signed-off-by: José Valim <>
Santiago Pastorino Changelog update for Object#responding deprecation
Signed-off-by: José Valim <>
Santiago Pastorino Changes Object#returning with Object#tap on guides ae63d5c
Jul 26, 2010
Leigh Caplan Override new on proxy objects so that they never wrap nil or false. a9ef2fd
Leigh Caplan Test to ensure that falsy objects aren't wrapped by deprecation proxies 27651c1
Aug 01, 2010
Santiago Pastorino Makes form_helper use overriden model accessors backport 8141f08
Aug 03, 2010
Subba Rao Pasupuleti In nested_attributes when association is not loaded and association r…
…ecord is saved then in memory record attributes should be saved

[#5053 state:resolved]

Signed-off-by: José Valim <>
Aug 05, 2010
Xavier Noria it is no longer true that load_paths are going to be removed in final 15cafbe
Aug 11, 2010
Michael Koziarski Revert "Ruby 1.9.2: explicitly raise NoMethodError for attempts at ex…
…plicit coercion"

This reverts commit 64082b3.

This change broke compatibility with 1.8.6 and was only needed for older 1.9.2 versions


Aug 15, 2010
Santiago Pastorino Making time_zone_options_for_select return a html_safe string master …
Aug 18, 2010
Jeff-Lawson Bug Fix -- clean up connection after stored procedure [#3151 state:re…
…solved] for 2-3-stable
Jeff-Lawson Bug Fix -- clean up connection after stored procedure [#3151 state:re…
…solved] for 2-3-stable
Aug 20, 2010
Xavier Noria revises guides generation add3ccb
Xavier Noria restores railties/README as home page of the API 11361a9
Aug 25, 2010
Mikel Lindsaar Make ActiveResource::InvalidRequestError more user friendly
Signed-off-by: Xavier Noria <>
Aug 29, 2010
Jeremy Kemper Exclude guides from gem to keep file size small bdace5d
Jeremy Kemper Prepare for Rails 2.3.9. Release 2.3.9.pre gems. b2c9198
Mikel Lindsaar Updating documentation on ActiveResource HTTP Mock and also adding te…
…st coverage
Mikel Lindsaar Back porting HttpMock test from Rails 3 master 56fdfeb
Mikel Lindsaar Adding option to ActiveResource to allow you to not reset the previou…
…sly stored requests and responses by passing false to respond_to

Backport of commit 2a1b23f on rails/master
Aug 31, 2010
Jeremy Kemper require 'thread' for Mutex dependency 6f17422
Sep 03, 2010
Ken Collins Conversion of a two dimensional array that is ruby 1.8.6 safe. Fix pa…
…ren warnings too.

Signed-off-by: Michael Koziarski <>
Sep 04, 2010
Jeremy Kemper Rails 2.3.9 a61a39e
Sep 08, 2010
Mislav Marohnić fix setting session cookie with activerecord and memcache store
Commit f8f3653 broke setting the session ID cookie for requests without 'HTTP_COOKIE' header
when using activerecord or memcache store. Integration tests didn't catch this because they
always set the HTTP_COOKIE header for mock requests, so now this is changed to only set the
header if there are cookies.

[#5581 state:committed]

Signed-off-by: Santiago Pastorino <>
Sep 09, 2010
Mikel Lindsaar Adding documentation to redirect_to and status code option references 597fb1d
Sep 10, 2010
Erik Michaels-Ober Fix typo in deprecation warning
Object#returning should be Kernel#returning
Erik Michaels-Ober Add support for mysql2 adapter e8b84ab
Andrew Kaspick Fix fixtures in integration test sessions
Signed-off-by: Michael Koziarski <>
Jeremy Kemper Ruby 1.9 compat: convert Pathname to string 761c9cd
Emilio Tagua Add more examples in performance script.
[#5610 state:committed]

Signed-off-by: Jeremy Kemper <>
Sep 14, 2010
W. Andrew Loe III Only send secure cookies over SSL. 17f2fb4
Sep 24, 2010
Colin Casey Test for imposed version number as last part of gem directory name fo…
…r frozen gems

[#4295 state:resolved]

Signed-off-by: José Valim <>
Colin Casey Fix for imposed version number as last part of gem directory name for…
… frozen gems

Signed-off-by: José Valim <>
Sep 27, 2010
Andrew Kaspick memoized protected methods should remain protected
Signed-off-by: Michael Koziarski <>
Michael Koziarski Revert "Makes form_helper use overriden model accessors backport"
This change introduced breakages and test failures.

This reverts commit 8141f08.
Étienne Barrié Fix add_index with a symbol #4891 bc52d81
Sep 28, 2010
Ryan Wallace Add test to demonstrate failure with eager loading hmt where the asso…
…ciation has an order.
marklazz Preserving :include options for hmt association with an order but wit…
…hout conditions [#5262 state:resolved]
Sep 30, 2010
Emilio Tagua Use detect instead select to avoid sh [..] command not found. 1851596
Emilio Tagua Add examples to performance script that were included in version 3. 5a63df2
marklazz Remove duplication of conditions generated for associations when used…
… in conjunction with named_scopes [#4634 state: resolved]
marklazz AssociationCollection#include? working properly for objects added wit…
…h build method [#3472 state:resolved]
Aaron Patterson fixing space errors fb526a0
Oct 04, 2010
Aaron Patterson [#5406 state:resolved] calling the correct method on minitest to obta…
…in the test name
Aaron Patterson calling correct method on minitest for test name when teardown callba…
…ck fails
Oct 12, 2010
Geoff Buesing require 'uri' in action_controller/url_rewriter [#5555 state:resolved]
Signed-off-by: José Valim <>
Oct 15, 2010
Michael Koziarski Revert 7d2173e which introduced a security vulnerability.
This addresses  CVE-2010-3933
Michael Koziarski Prepare for the 2.3.10 release f5ed5c3