Skip to content


Subversion checkout URL

You can clone with
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rails/rails
head fork: rails/rails
This comparison is big! We’re only showing the most recent 250 commits
Commits on Dec 27, 2009
@dhh dhh Fix tests 1684aa1
Commits on Dec 28, 2009
@fcheung fcheung honour inverse_of when preloading associations
Signed-off-by: Michael Koziarski <>
Signed-off-by: Eloy Duran <>
@fcheung fcheung honour :inverse_of for joins based include
Signed-off-by: Michael Koziarski <>
Signed-off-by: Eloy Duran <>
@oggy oggy Set inverse for #replace on a has_one association. [#3513 state:resol…

Signed-off-by: Eloy Duran <>
@h-lame h-lame Add more tests for the various ways we can assign objects to associat…
…ions. [#3513 state:resolved]

Get rid of a duplicate set_inverse_instance call if you use new_record(true) (e.g. you want to replace the existing instance).

Signed-off-by: Eloy Duran <>
@oggy oggy Add inverse polymorphic association support. [#3520 state:resolved]
Signed-off-by: Eloy Duran <>
@h-lame h-lame Provide a slightly more robust we_can_set_the_inverse_on_this? method…
… for polymorphic belongs_to associations. [#3520 state:resolved]

Also add a new test for polymorphic belongs_to that test direct accessor assignment, not just .replace assignment.

Signed-off-by: Eloy Duran <>
@h-lame h-lame Make polymorphic_inverse_of in Reflection throw an InverseOfAssociati…
…onNotFoundError if the supplied class doesn't have the appropriate association. [#3520 state:resolved]

Signed-off-by: Eloy Duran <>
@alloy alloy Make sure to not add autosave callbacks multiple times. [#3575 state:…

This makes sure that, in a HABTM association, only one join record is craeted.
@siebertm siebertm Add an :update_only option to accepts_nested_attributes_for for to-on…
…e associations. [#2563 state:resolved]

Signed-off-by: Eloy Duran <>
@alloy alloy Refactored previous changes to nested attributes. 90f001b
@jeremy jeremy Fix pg test 54bc485
Commits on Jan 01, 2010
@wvanbergen wvanbergen Bugfixes, speed improvements and code cleanup for Nokogiri's and LibX…
…ML's XmlMini backend


Signed-off-by: Jeremy Kemper <>
@wvanbergen wvanbergen Added two SAX-based backends for XmlMini, using both LibXML and Nokog…


Signed-off-by: Jeremy Kemper <>
Commits on Jan 02, 2010
Carsten Gehling I18n label helper [#745 status:resolved]
Signed-off-by: José Valim <>
Commits on Jan 03, 2010
@stefanpenner stefanpenner Failing test case RE: Ticket 3131 b3dd14a
@stefanpenner stefanpenner Fixed multiparameter attribute assignment bug RE: Ticket 3131 c362a76
Commits on Jan 04, 2010
@zbrock zbrock fixing autolinking other protocols
Signed-off-by: Michael Koziarski <>
[#3494 state:committed]
@FooBarWidget FooBarWidget The failsafe middleware should flush the logger upon logging the erro…
…r, otherwise nothing will be written to the log file.

Signed-off-by: Michael Koziarski <>
@josevalim josevalim Make ActionPack specs work when I18n 0.3.3 is installed as gem. 319e4aa
Commits on Jan 07, 2010
@josevalim josevalim Use helpers.label instead of views.labels. b7fd426
@hardbap hardbap Allows you to pass :all_blank to :reject_if option to automatically c…
…reate a Proc that will reject any record with blank attributes.

[#2501 state:resolved]

Signed-off-by: Eloy Duran <>
@alloy alloy Refactored nested attributes a bit after last commit. e20ac99
@alloy alloy Add AssociationReflection#collection_association? which returns true …
…if it's for a has_many or has_and_belongs_to_many association.
@alloy alloy Cleanup some code in nested_attributes.rb, autosave_association.rb, a…
…nd associations.rb with AssociationReflection#collection_association?

Also cache the result value.
@alloy alloy Don't use strings for callbacks, as these will be evaled. Rather use …
…symbols, which uses a direct method dispatch.

Patch by Comron Sattari. [#3429 state:resolved]
@alloy alloy Removed unnecessary call to #try and cleaned up a bit more. 3d17d79
@alloy alloy Remove deprecated '_delete' option from NestedAttributes. b3bd101
@alloy alloy Moved the validation logic to the association reflection and refactor…
…ed autosave_association.rb a bit.
@alloy alloy Raise a RecordNotFound if an ID in nested attributes is given but doe…
…sn't return a record. [#2415 state:resolved]
Commits on Jan 08, 2010
@dhh dhh Fixed that fragment caching should return a cache hit as html_safe (o…
…r it would all just get escaped) [DHH]
@dhh dhh Fixed that much of DateHelper wouldn't return html_safe? strings [DHH] d5ba7c3
@bryanstearns bryanstearns Add failing test that triggers the stack overflow for #2578.
Signed-off-by: Eloy Duran <>
@lawrencepit lawrencepit Exclude unchanged records from the collection being considered for au…
…tosave. [#2578 state:resolved]

Signed-off-by: Eloy Duran <>
@alloy alloy Rollback the transaction when one of the autosave associations fails …
…to save. [#3391 state:resolved]
@alloy alloy Renamed AssociationReflection #collection_association? to #collection?. 51e6124
Jeffrey Hardy Allow AR::Schema's migrations_path to be overwritten by subclasses. D…
…efaults to 'db/migrate'

[#3671 state:committed]

Signed-off-by: Jeremy Kemper <>
@dhh dhh Fixed that PrototypeHelper#update_page should return html_safe [DHH] 4682035
@dhh dhh Merge branch '2-3-stable' of into 2-3-stable 94de32b
@josevalim josevalim Merge remote branch 'eloy/2-3-stable' into 2-3-stable c50609c
Commits on Jan 18, 2010
@sikachu sikachu Make local_request? to returns true when facing ::1 IPv6 address [#3257
… status:resolved]

Signed-off-by: José Valim <>
Commits on Jan 19, 2010
@sikachu sikachu Fix bug that causes to_utf_offset_s to returns wrong offset when hour…
… < 0 and not in hundreds [#3741 status:resolved]

Signed-off-by: José Valim <>
Commits on Jan 21, 2010
@sikachu sikachu Update vendored i18n gem to 0.3.3 [#3492 status:resolved]
Signed-off-by: José Valim <>
Commits on Jan 27, 2010
@schmidt schmidt Adding custom yaml (de-)serialization for OrderedHash
[#3608 state:committed]

Signed-off-by: Jeremy Kemper <>
Commits on Jan 28, 2010
@snusnu snusnu active_support/ordered_hash now requires yaml ce50c96
@gbuesing gbuesing Time#- with a DateTime argument behaves the same as with a Time argum…
…ent, i.e. returns the difference between self and arg as a Float [#3476 status:resolved]
@rubymerchant rubymerchant Use format of ARes rather than content-type of remote errors to load …

[#1956 state:committed]

Signed-off-by: Jeremy Kemper <>
Commits on Jan 29, 2010
@jeremy jeremy Cherry-pick bd74060 from i18n master to fix broken string interpolation 02e5150
Commits on Feb 02, 2010
@mrduncan mrduncan Bump year in MIT licenses
Signed-off-by: Joshua Peek <>
@josh josh Fix empty Set-Cookie headers [#3811 state:resolved] 0c0da1a
Commits on Feb 05, 2010
Santiago Pastorino and José Ignacio Costa Backport html_safe. Use latest rails_xss plugin for forward-compatibi…
…lity with Rails 3.
Santiago Pastorino and José Ignacio Costa Added backwards compatibility for html_safe! 55c1a86
@brianmario brianmario Add yajl-ruby as a JSON parsing backend
[#2666 state:committed]

Signed-off-by: Jeremy Kemper <>
@jeremy jeremy Automatically prefer Yajl or JSON backend over Yaml, if available d5b4f4d
Santiago Pastorino and José Ignacio Costa Tests for html_safe! backwards compatibility are restored 8a0e8f0
Santiago Pastorino and José Ignacio Costa Fixed html_safe test cases which weren't testing correctly backport f…
…rom 3.0

[#3869 state:committed]

Signed-off-by: Jeremy Kemper <>
Commits on Feb 06, 2010
@mikel mikel Changed version of TMail to 1.2.6 696ec1f
Commits on Feb 07, 2010
@mikel mikel Changing test, TMail now encodes this correctly 9a042ba
@mikel mikel Fixing TMail encoding problem, porting to ActionMailer d53a590
@mikel mikel Updating to TMail 1.2.7 4645cd1
@jeremy jeremy Ruby 1.9: cookie header parser works with either newline-delimited st…
…rings or arrays
@mikel mikel Fixed test to check using 8Bit and verified, removed stray require 16b6d42
@mikel mikel Reindended and handled old ruby syntax 1bf79f1
@jeremy jeremy Merge remote branch 'mikel/2-3-stable' into 2-3-stable 6f9f1d3
@jeremy jeremy Update CHANGELOG 84541c4
@gabrielmansour gabrielmansour Fix pluralization for numbers formatted like '1.00'
Signed-off-by: Jeremy Kemper <>
Commits on Feb 13, 2010
Santiago Pastorino and José Ignacio Costa simple_format returns a safe buffer escaping unsafe input [Santiago P…
…astorino] (Closes #3767)

Signed-off-by: David Heinemeier Hansson <>
Commits on Feb 17, 2010
@m4n m4n Fix error_messages_for i18n issue if object_name has underscores [#3629
… status:resolved]

Signed-off-by: José Valim <>
Commits on Feb 18, 2010
@jeremy jeremy Use instead of rename to copy in case of cross-device links 3926107
Commits on Feb 19, 2010
Santiago Pastorino and José Ignacio Costa Making SafeBuffer << an alias for concat method d7ee4bb
Santiago Pastorino and José Ignacio Costa html_escape mail_to when encode javascript and not hex 62c802c
@spastorino spastorino i18n translate with arrays issue solved 397262a
@spastorino spastorino ruby 1.9 array.to_s returns a string representing an escaped array 64d28f6
@spastorino spastorino missings html_safe added 2491175
@spastorino spastorino missing html_safe added and tests 39bcf14
Commits on Feb 25, 2010
@spastorino spastorino add time_separator for minutes only if minutes aren't hidden
Signed-off-by: Jeremy Kemper <>
@jeremy jeremy Missing fileutils require 5b4e7c3
@jeremy jeremy Missed singleton_class 3a3fa7f
@jeremy jeremy Use Object#singleton_class instead of #metaclass. Prefer Ruby's choice. 63a7ef0
Christoph Schiessl remove rubygems (version >= 1.3.6) deprecation message by replacing G…
…em::Dependency#version_requirements with Gem::Dependency#requirement

[#4026 state:committed]

Signed-off-by: Prem Sichanugrist <>
Signed-off-by: Jeremy Kemper <>
@jeremy jeremy Fill in for I18n.normalize_translation_keys removed from 0.3.4 5695b1b
Commits on Feb 26, 2010
Tobias Bielohlawek fixed a 'RecordNotFound' bug when calling 'reload' on a object which …
…doesn't met the default_scope conditions, added test [#3166 status:resolved]

The reload method didn't made use of 'with_exclusive_scope' when reloading the object. This lead to a RecordNotFound exception, in case the object doesn't met the default_scope condition (anymore) - which is obviously a bug. This quick fix makes use of with_exclusive_scope in the reload method as well. See test for full example.

Signed-off-by: José Valim <>
@jeremy jeremy Deprecate toplevel plugins tasks in favor of lib/tasks for Rails 3 fo…
…rward compat
@jeremy jeremy Add *.gem, pkg, and .bundle to .gitignore. Remove globs that should b…
…e in user's global ignores.
@jeremy jeremy Typo: _tasks -> _paths f56a163
Commits on Mar 02, 2010
@brynary brynary Bump version constants to 2.3.6 to more easily support generating pre…
…release gems
@jeremy jeremy Deprecate omitting the leading slash on a path arg to assert_redirect…
Commits on Mar 05, 2010
@spastorino spastorino Adds disable option to date_helpers generated hidden fields when html…
…_options specifies it. ht by Marc Schütz

[#3807 state:committed]

Signed-off-by: Jeremy Kemper <>
@stijnster stijnster Removed the + sign as an accepted character from the parameterize met…
…hod, as a + sign is interpreted by the browser as a space, possibly resulting in a "ArgumentError: illegal character in key"

[#4080 state:committed]

Signed-off-by: Jeremy Kemper <>
Commits on Mar 07, 2010
@tenderlove tenderlove converting inject to each and map
[#4119 state:committed]

Signed-off-by: Jeremy Kemper <>
Commits on Mar 09, 2010
@jeremy jeremy Disprefer JSONGem decoder since it only decodes JSON objects abb8fbd
Commits on Mar 11, 2010
@rubys rubys Add deprecation warning for overwrite_params and remove rdoc
[#4073 state:committed]

Signed-off-by: Jeremy Kemper <>
Commits on Mar 12, 2010
@jeremy jeremy OutputBuffer#to_yaml should return string yaml, not some custom class…
… dump
@jeremy jeremy Write strings to fragment cache, not outputbuffers eed8a88
@jeremy jeremy Be sure to pass through args to to_yaml 40c393c
Commits on Mar 14, 2010
@spastorino spastorino There's a Ruby issue with File.basename different versions returns di…
…fferent things, so we shouldn't test that


Signed-off-by: Jeremy Kemper <>
Commits on Mar 15, 2010
@jeremy jeremy read_ and write_fragment cache preserve html safety yet cache strings…
… only
@basvk basvk Fixed a bug in JSON decoding with Yaml backend, where a combination o…
…f dates, escaped or unicode encoded data and arrays would make the parser fail with a ParseError exception.


Signed-off-by: Yehuda Katz <>
Signed-off-by: Jeremy Kemper <>
@jeremy jeremy to_str works here b3d32a5
Commits on Mar 16, 2010
@spastorino spastorino object_and_class_ext_test warnings removed
Signed-off-by: Jeremy Kemper <>
@spastorino spastorino Change array entries to safe doesn't worth then the array is joined a…
…s a string losing the safe property of his entries

Signed-off-by: José Valim <>
@Manfred Manfred Improve performance of Multibyte::Utils.
Replace explicit for-loops by faster enumeration methods.


Signed-off-by: Jeremy Kemper <>
@jamesgolick jamesgolick Improve performance of multibyte utils.
Switch from using String#match to using String#=~. There's no need to
generate a MatchData for each iteration since we're not using it.

Signed-off-by: Jeremy Kemper <>
@spastorino spastorino translation method of TranslationHelper module returns always SafeBuf…
…fer [#4194 status:resolved]

Signed-off-by: Jeremy Kemper <>
@spastorino spastorino scope_key_by_partial fix for Ruby 1.9 when there's virtual_path
[#4202 state:committed]

Signed-off-by: Jeremy Kemper <>
Commits on Mar 17, 2010
@jeremy jeremy Bundler returns a Pathname from #loaded_from; work around it f175d19
@jeremy jeremy Don't rely on Active Support being loaded here c0137f6
Commits on Mar 22, 2010
@nono nono button_to should generate an html_safe string
Signed-off-by: Michael Koziarski <>
@spastorino spastorino ActionView::SafeBuffer should be there for backwards compatibility [#…
…4241 state:committed]

Signed-off-by: Michael Koziarski <>
Commits on Mar 25, 2010
@cwninja cwninja Fix incorrect relative paths being used when looking up templates.
The bug will manifest itself by failing to locate templates when running tests,
or when running as a daemon (from /).

It relates the the different behavior of ActionView::Template::Path#to_s and
ActionView::Template::Path#to_str when a RAILS_ROOT is defined. #to_s reports
a path relative to the root, and #to_str reports an absolute path.

Signed-off-by: José Valim <>
@divoxx divoxx Set mailer template_root as absolute path [#2263 state:resolved]
Signed-off-by: José Valim <>
@miloops miloops Allow deprecation messages with or without a final period.
Signed-off-by: José Valim <>
Commits on Mar 26, 2010
@josevalim josevalim Added compatibility to Ruby 1.9.2. 157c180
Commits on Mar 27, 2010
@jrafanie jrafanie Marshaling a time object added an instance variable to the object whi…
…ch affected the quoting of serialized attributes because the to_yaml of the original object did not match the to_yaml of the marshaled one. Also, Marshal.dump was modifying the source object which the client may not be aware of.

Signed-off-by: wycats <>
Commits on Mar 28, 2010
@spastorino spastorino Time marshalling backported [#4286 state:committed]
Signed-off-by: wycats <>
@spastorino spastorino flatten not needed here
Signed-off-by: wycats <>
@spastorino spastorino backport of inconsistency with cattr_reader and matter_reader with so…
…me tweaks

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

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


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

Signed-off-by: Pratik Naik <>
@xuanxu xuanxu new assertion: assert_blank
Signed-off-by: Xavier Noria <>
@xuanxu xuanxu New assertion: assert_present
Signed-off-by: Xavier Noria <>
@spastorino spastorino Don't cache the utc_offset we are already caching the timezone [#4301]
Signed-off-by: Jeremy Kemper <>
Commits on Mar 31, 2010
@fxn fxn avoid method redefined; discarding old empty? warning [Santiago Pasto…
@lifo lifo Dont try to load the record from the db if preloading didn't find any…
@lifo lifo Dont use Rails 3 finder syntax in Rails 2.3.x test [#4303 state:resol…
Commits on Apr 01, 2010
@dhh dhh Added Object#presence that returns the object if it's #present? other…
…wise returns nil [DHH/Colin Kelley]
@jeremy jeremy 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
Commits on Apr 02, 2010
@spastorino spastorino utc_offset is no longer required on TimeZone and if it's not supplied…
… we delegate to TZInfo
@spastorino spastorino delegate unknown timezones to TZInfo 2c148cd
@jeremy jeremy CI: add tzinfo e2ec41a
@jeremy jeremy Adjust test in case tzinfo is not available 19161e0
@jeremy jeremy Check more carefully for vendored tzinfo a72bcdb
Commits on Apr 04, 2010
@pixeltrix pixeltrix Backport of lazy evaluation of has_many ..., :dependent => :___
[#2627 state:committed]

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

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

Signed-off-by: Jeremy Kemper <>
Commits on Apr 09, 2010
@dhh dhh Fixed that default locale templates should be used if the current loc…
…ale template is missing [DHH]
@rolfb rolfb Changed the way inflections for uncountables work for 'funky jeans'
Signed-off-by: José Valim <>
@josevalim josevalim Fix tests broken in 0653a6d f87a518
@spastorino spastorino fix stack trace lines on class_eval
Signed-off-by: José Valim <>
@josevalim josevalim Fix a failure added on 958b0e9 4a02437
Commits on Apr 10, 2010
@jeremy jeremy CI: message for some outstanding failures 56c5290
@jeremy jeremy Refactor for readability efec9b2
@jeremy jeremy CI: show all headers for diagnosis d91d6fe
@jeremy jeremy Only set response etag if body is not blank 2cd29f4
@hypothetical 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 yaroslav Fix Array#to_xml to produce valid markup when working with namespaced…
… classes [#3624 state:resolved]

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

Signed-off-by: José Valim <>
Commits on Apr 14, 2010
@lifo lifo Ensure not to load the entire association when bulk updating existing…
… records using nested attributes
@fxn fxn fix dash -> edit in an example, and a few touches now that we are here b8b568e
Commits on Apr 15, 2010
@libc libc Implement find_in_batches without with_scope [#2227 state:resolved]
Signed-off-by: Pratik Naik <>
Commits on Apr 16, 2010
@mislav mislav 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 jeremy Distinguish test for 1.8.6 compat c55cdd8
Commits on Apr 17, 2010
@mislav mislav `String#starts/ends_with?` should return false for non-string argumen…
…t, not raise error

Signed-off-by: Jeremy Kemper <>
@jeremy jeremy Fix 1.9-specific syntax error in test 8b79c7c
@jeremy jeremy Upgrade bundled i18n from 1.3.3 to 1.3.7 fd5c6e2
Commits on Apr 19, 2010
@jeremy jeremy MemoryStore#read_multi(*keys) for dev-mode compatibility with memcach…
…e store
Commits on Apr 21, 2010
@spastorino spastorino TimeZones lazy load
Signed-off-by: Jeremy Kemper <>
@spastorino spastorino load tzinfo on initialize only
Signed-off-by: Xavier Noria <>
Commits on Apr 22, 2010
Sam Elliott and Santiago Pastorino Is not nessesary to have @_rails_html_safe instance var when the stri…
…ng is unsafe, also it breaks to_yaml [#3535 state:committed]
Commits on Apr 24, 2010
@libc libc 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 jeremy PostgreSQL: use standard-conforming strings if possible c9e1570
@jeremy jeremy PostgreSQL: remove the unnecessary heuristic checking whether the val…
…ue is escaped
@jeremy jeremy Remove quoted_string_prefix entirely since PostgreSQL was the only da…
…tabase adapter relying on it.
Commits on Apr 25, 2010
@jeremy jeremy Ruby 1.9: ERB template encoding using a magic comment at the top of t…
…he file
@jeremy jeremy Ensure ERB source begins with the encoding comment 70034d8
@amatsuda amatsuda Fix pattern to match various magic comment formats 4082001
@jeremy jeremy 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 jeremy 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
@e2 e2 actionpack: added missing encoding comments [#4466 state:resolved]
Signed-off-by: Jeremy Kemper <>
@jeremy jeremy Fix unstated AS::Multibyte dependency 8716ee4
@jeremy jeremy Fix backport error: wrong exception name 9e262de
Commits on Apr 26, 2010
Joe Martinez 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 <>
Commits on Apr 28, 2010
@cghawthorne cghawthorne 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 <>
Commits on Apr 29, 2010
@neerajdotname neerajdotname making rake:migrate VERSION=0 a noop called in succession. [#2137 sta…

Signed-off-by: José Valim <>
Commits on May 01, 2010
@marius marius 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 <>
Commits on May 04, 2010
@lifo lifo Use class_inheritable_accessor for connection_handler 04fa5af
@brianmario brianmario Allow pre-casted values (other than nil) to pass through from calcula…
…tions un-touched

[#4514 state:committed]

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


@brianmario brianmario add support for mysql2 adapter to dbconsole
[#4532 state:committed]

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

Signed-off-by: Jeremy Kemper <>
@spastorino spastorino 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 <>
Commits on May 08, 2010
@eparreno eparreno 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 <>
@spastorino spastorino The intention here was to assign to different objects ht: Radar 555801c
Carl Lerche Revert "Add index length support for MySQL [#1852 state:resolved]" (b…
…reaks the build)

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

This reverts commit eababa3.
@lifo lifo Make sure schema dumper doesnt throw up when there are no index lengths 3c1bb40
Commits on May 11, 2010
@josevalim josevalim Remove i18n interpolation deprecation. It has been around since 2.2. 8e679f1
Commits on May 12, 2010
@spastorino spastorino 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 jeremy Drop require removed by 8e679f1 9ab1154
@lifo lifo Use superclass_delegating_accessor for connection handlers 7cbc546
@spastorino spastorino to_json and to_xml tests added to ActiveResource
[#4529 state:resolved]

Signed-off-by: Jeremy Kemper <>
Commits on May 14, 2010
@josevalim josevalim Remove deprecated tests according to 8e679f1 6949d6f
Commits on May 15, 2010
@joshk joshk 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 <>
@jeffkreeftmeijer jeffkreeftmeijer partial counters with :as [#2804 state:resolved]
Signed-off-by: Jeremy Kemper <>
@neerajdotname neerajdotname db:drop:all throws error when database does not exist [#2997 state:re…

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

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

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

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

Signed-off-by: José Valim <>
@neerajdotname neerajdotname Fix broken integration test in 2.x [#4565 state:resolved]
Signed-off-by: José Valim <>
@no6v no6v 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 <>
@matthewrudy matthewrudy 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 <>
@jeffkreeftmeijer jeffkreeftmeijer Added assert_attribute_type to clean up GeneratedAttributeTest [#2377

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

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

Signed-off-by: José Valim <>
@etiennebarrie etiennebarrie 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 jeremy 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]
@fxn fxn 1.9 compat: deprecated last_(month|year) in favor of prev_(month|year) 25ec613
Commits on May 22, 2010
@tenderlove tenderlove backporting beda2d4 for newer sqlite-ruby bindings
Signed-off-by: Xavier Noria <>
Commits on May 23, 2010
@jeremy jeremy Remove miscommit from 57337cd d8f0a58
@jeremy jeremy 2.3.6 release 56bb550
@jeremy jeremy Bump 2-3-stable to 2.3.7 55e88ee
@nex3 nex3 Mark all raw HTML being concatted as HTML-safe.
Signed-off-by: Jeremy Kemper <>
@nex3 nex3 Don't always mark the argument to #concat as HTML-safe.
Signed-off-by: Jeremy Kemper <>
@nex3 nex3 Don't incompatibly monkeypatch ERB.
Signed-off-by: Jeremy Kemper <>
@jeremy jeremy Fix test rendering unmarked but safe HTML ca5f5d9
@jeremy jeremy Use a non-XSS-protected output buffer for view tests ab2d7c8
@jeremy jeremy Revert "Don't always mark the argument to #concat as HTML-safe."
This reverts commit e53791f.
@spastorino spastorino Make use of safe_concat on TextHelper concat
Signed-off-by: Jeremy Kemper <>
Commits on May 24, 2010
@jeremy jeremy rails_xss handles deprecated String html safety, when installed 3ff921a
@jeremy jeremy Move tests for deprecated String#html_safe! to plugin 60e82a3
@jeremy jeremy 2.3.7 release: fix rails_xss compatibility 326188c
@jeremy jeremy Bump 2-3-stable to 2.3.8 f97da34
@jeremy jeremy 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...
@wycats wycats Give the ERB String the encoding of the original template 50b7c0c
@wycats wycats Needs to work on 1.8 too 8e6a044
@spastorino spastorino Revert "translation method of TranslationHelper module returns always…
… SafeBuffer [#4194 status:resolved]"

This reverts commit 2310aef.

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

[#4675 state:committed]

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

Signed-off-by: Jeremy Kemper <>