Skip to content
This repository
  • 662 commits
  • 275 files changed
  • 56 comments
  • 88 contributors
This comparison is big! We're only showing the most recent 250 commits
Nov 25, 2009
Michael Koziarski Remove strange .diff file c7057a2
Nov 27, 2009
Eric Chapweske Decode http_authentication creditentials without generating abitrary …
…symbols.
3719bd3
Gabe da Silveira Make sure strip_tags removes tags which start with a non-printable ch…
…aracter

Signed-off-by: Michael Koziarski <michael@koziarski.com>
bfe0328
Nov 28, 2009
Joey Aghion avoid generating invalid SMTP commands in ruby pre 1.9
Signed-off-by: Michael Koziarski <michael@koziarski.com>
da61a6c
Dec 02, 2009
Mike Breen Implement ActiveRecord#reset_counter_cache
[#1211 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
1db3a27
Fix instance_eval calls to association proxies
In the current stable, ActiveRecord::Associations::AssociationProxy#method_missing calls yield() if a block is given, causing the block to always be evaluated in its calling context. However, in the case of instance_eval, correct behavior requires that the block be passed directly to the @target, rather than being evaluated inside a different block. Incidentally, this also simplifies the code slightly.

[#3412 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2f1ded3
Dec 03, 2009
Michael Koziarski 1.9 Fix for exception views. c253d7b
Ben Marini Add support for Mysql column positioning via #add_column and #change_…
…column

add_column and change_column in the Mysql adapter now accept some
additional options:
:first => true        # Put the column in front of all the columns
:after => column_name # Put the colmn after 'column_name'

add_column :new_col, :string, :first => true
add_column :another_col, :integer, :default => 0, :after => :new_col

[#3286 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ccb197b
Gabe da Silveira Replace reset_counter_cache with reset_counters that has API inline w…
…ith existing update_counters method

[#1211 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
43d2cb8
Dec 06, 2009
Jeremy Kemper Ruby 1.9: don't rely on . in load path b92ff78
Jeremy Kemper Ruby 1.9.2: explicitly raise NoMethodError for attempts at explicit c…
…oercion
64082b3
Jeremy Kemper Ruby 1.9.2: exclude to_str from explicit coercion check too b9f3523
Dec 11, 2009
Fix postgresql AR test failure
Due to the ordering of the returning result set, the test fails under the postgresql adapter. Order results by id prior to checking the first item

[#3542 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
1d9468b
Dec 14, 2009
David Heinemeier Hansson Add Enumerable#exclude? to bring parity to Enumerable#include? and av…
…oid if !x.include?/else calls [DHH]
fda3ac6
David Heinemeier Hansson Dont be an ass and leave merge shit in stable, please f039bbb
Dec 15, 2009
Serguei Filimonov Added #to_i to DateTime in ActiveSupport so #to_yaml works correctly …
…on ActiveRecord models with DateTime attributes.
754bbaa
Geoff Buesing Add test for TimeWithZone#to_i with wrapped DateTime e4ebaab
David Heinemeier Hansson Added cookies.permanent, cookies.signed, and cookies.permanent.signed…
… accessor for common cookie actions [DHH]
0200e20
David Heinemeier Hansson Its cookie_verifier_secret 6d1494c
David Heinemeier Hansson Accessing nonexistant cookies through the signed jar should not raise…
… an exception
1229ef7
Dec 16, 2009
When passing force_reload = true to an association, don't use the que…
…ry cache [#1827 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
b1bbf90
José Valim Fix another regression due to the inclusion of ActiveRecord::Error.
If a string is supplied to :default, it should not be used a
translation key (we already have :message for that).
[#3564 status:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
1c3711b
David Heinemeier Hansson Fix the app generator of cookie_verification_secret.rb 48cd7df
Dec 17, 2009
David Heinemeier Hansson Added :alert, :notice, and :flash as options to ActionController::Bas…
…e#redirect_to that'll automatically set the proper flash before the redirection [DHH] Added ActionController::Base#notice/= and ActionController::Base#alert/= as a convenience accessors in both the controller and the view for flash[:notice]/= and flash[:alert]/= [DHH]
e6cadd4
David Heinemeier Hansson Models with no attributes should just have empty hash fixtures [Sam] …
…(Closes #3563)
8bb3b9b
Dec 21, 2009
Murray Steele Providing support for :inverse_of as an option to associations.
You can now add an :inverse_of option to has_one, has_many and belongs_to associations.  This is best described with an example:

class Man < ActiveRecord::Base
  has_one :face, :inverse_of => :man
end

class Face < ActiveRecord::Base
  belongs_to :man, :inverse_of => :face
end

m = Man.first
f = m.face

Without :inverse_of m and f.man would be different instances of the same object (f.man being pulled from the database again).  With these new :inverse_of options m and f.man are the same in memory instance.

Currently :inverse_of supports has_one and has_many (but not the :through variants) associations.  It also supplies inverse support for belongs_to associations where the inverse is a has_one and it's not a polymorphic.

Signed-off-by: Murray Steele <muz@h-lame.com>
Signed-off-by: Michael Koziarski <michael@koziarski.com>
Signed-off-by: José Valim <jose.valim@gmail.com>
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>

Conflicts:

	activerecord/lib/active_record/associations/belongs_to_association.rb
	activerecord/lib/active_record/associations/has_one_association.rb
5374fb3
Dec 23, 2009
Fix ActiveSupport::JSON encoding of control characters [\x00-\x1f]
According to RFC 4627, only the following Unicode code points are
allowed unescaped in JSON:

  unescaped = %x20-21 / %x23-5B / %x5D-10FFFF

However, ActiveSupport::JSON did not escape the range %x00-1f.  This caused
parse errors when trying to decode the resulting output.

[#3345 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
a900205
Dec 24, 2009
David Heinemeier Hansson Translated strings in the view are assumed html_safe (Closes #3401) 2675e4e
Dec 27, 2009
David Heinemeier Hansson Fix tests 1684aa1
Dec 28, 2009
Frederick Cheung honour inverse_of when preloading associations
Signed-off-by: Michael Koziarski <michael@koziarski.com>
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
894c9b1
Frederick Cheung honour :inverse_of for joins based include
Signed-off-by: Michael Koziarski <michael@koziarski.com>
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
ab09ffd
George Ogata Set inverse for #replace on a has_one association. [#3513 state:resol…
…ved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
ed5b894
Murray Steele 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 <eloy.de.enige@gmail.com>
592085b
George Ogata Add inverse polymorphic association support. [#3520 state:resolved]
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
cca75ca
Murray Steele 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 <eloy.de.enige@gmail.com>
603b28c
Murray Steele 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 <eloy.de.enige@gmail.com>
3470b30
Eloy Durán Make sure to not add autosave callbacks multiple times. [#3575 state:…
…resolved]

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

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
7074c5a
Eloy Durán Refactored previous changes to nested attributes. 90f001b
Jeremy Kemper Fix pg test 54bc485
Jan 01, 2010
Willem van Bergen Bugfixes, speed improvements and code cleanup for Nokogiri's and LibX…
…ML's XmlMini backend

[#3641]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
12f6fd0
Willem van Bergen Added two SAX-based backends for XmlMini, using both LibXML and Nokog…
…iri.

[#3636]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
37c5159
Jan 02, 2010
I18n label helper [#745 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
f5714ab
Stefan Penner Failing test case RE: Ticket 3131 b3dd14a
Stefan Penner Fixed multiparameter attribute assignment bug RE: Ticket 3131 c362a76
Jan 05, 2010
Zach Brock fixing autolinking other protocols
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#3494 state:committed]
f32c96e
Hongli Lai 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 <michael@koziarski.com>
1012dec
José Valim Make ActionPack specs work when I18n 0.3.3 is installed as gem. 319e4aa
Jan 07, 2010
José Valim Use helpers.label instead of views.labels. b7fd426
Mike Breen 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 <eloy.de.enige@gmail.com>
69db137
Eloy Durán Refactored nested attributes a bit after last commit. e20ac99
Eloy Durán Add AssociationReflection#collection_association? which returns true …
…if it's for a has_many or has_and_belongs_to_many association.
f12dd62
Eloy Durán Cleanup some code in nested_attributes.rb, autosave_association.rb, a…
…nd associations.rb with AssociationReflection#collection_association?

Also cache the result value.
c48a71c
Eloy Durán 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]
4b7a439
Eloy Durán Removed unnecessary call to #try and cleaned up a bit more. 3d17d79
Eloy Durán Remove deprecated '_delete' option from NestedAttributes. b3bd101
Eloy Durán Moved the validation logic to the association reflection and refactor…
…ed autosave_association.rb a bit.
6d056c7
Eloy Durán Raise a RecordNotFound if an ID in nested attributes is given but doe…
…sn't return a record. [#2415 state:resolved]
0dbe0f6
David Heinemeier Hansson Fixed that fragment caching should return a cache hit as html_safe (o…
…r it would all just get escaped) [DHH]
45e192d
Jan 08, 2010
David Heinemeier Hansson Fixed that much of DateHelper wouldn't return html_safe? strings [DHH] d5ba7c3
Bryan Stearns Add failing test that triggers the stack overflow for #2578.
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
2aef092
Lawrence Pit Exclude unchanged records from the collection being considered for au…
…tosave. [#2578 state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
eb22c24
Eloy Durán Rollback the transaction when one of the autosave associations fails …
…to save. [#3391 state:resolved]
c9a3929
Eloy Durán 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 <jeremy@bitsweat.net>
6e9b01f
David Heinemeier Hansson Fixed that PrototypeHelper#update_page should return html_safe [DHH] 4682035
David Heinemeier Hansson Merge branch '2-3-stable' of github.com:rails/rails into 2-3-stable 94de32b
Jan 09, 2010
José Valim Merge remote branch 'eloy/2-3-stable' into 2-3-stable c50609c
Jan 18, 2010
Prem Sichanugrist Make local_request? to returns true when facing ::1 IPv6 address [#3257
… status:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
6012e57
Jan 19, 2010
Prem Sichanugrist 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 <jose.valim@gmail.com>
ef10988
Jan 21, 2010
Prem Sichanugrist Update vendored i18n gem to 0.3.3 [#3492 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
652bdeb
Jan 27, 2010
Gregor Schmidt Adding custom yaml (de-)serialization for OrderedHash
[#3608 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
57337cd
Martin Gamsjaeger active_support/ordered_hash now requires yaml ce50c96
Geoff Buesing 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]
3f7729a
Jatinder Singh Use format of ARes rather than content-type of remote errors to load …
…errors.

[#1956 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
158e7b6
Jan 28, 2010
Jeremy Kemper Cherry-pick bd74060 from i18n master to fix broken string interpolation 02e5150
Feb 02, 2010
Matt Duncan Bump year in MIT licenses
Signed-off-by: Joshua Peek <josh@joshpeek.com>
b362b39
Joshua Peek Fix empty Set-Cookie headers [#3811 state:resolved] 0c0da1a
Feb 05, 2010
Backport html_safe. Use latest rails_xss plugin for forward-compatibi…
…lity with Rails 3.
9ca6df8
Added backwards compatibility for html_safe! 55c1a86
Brian Lopez Add yajl-ruby as a JSON parsing backend
[#2666 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
83b4c16
Jeremy Kemper Automatically prefer Yajl or JSON backend over Yaml, if available d5b4f4d
Tests for html_safe! backwards compatibility are restored 8a0e8f0
Fixed html_safe test cases which weren't testing correctly backport f…
…rom 3.0

[#3869 state:committed]

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

Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
4158282
Feb 17, 2010
Martin Andert Fix error_messages_for i18n issue if object_name has underscores [#3629
… status:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
6227ec1
Feb 18, 2010
Jeremy Kemper Use FileUtils.mv instead of rename to copy in case of cross-device links 3926107
Feb 19, 2010
Making SafeBuffer << an alias for concat method d7ee4bb
html_escape mail_to when encode javascript and not hex 62c802c
Santiago Pastorino i18n translate with arrays issue solved 397262a
Santiago Pastorino ruby 1.9 array.to_s returns a string representing an escaped array 64d28f6
Santiago Pastorino missings html_safe added 2491175
Santiago Pastorino missing html_safe added and tests 39bcf14
Feb 24, 2010
Santiago Pastorino add time_separator for minutes only if minutes aren't hidden
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
0307dba
Jeremy Kemper Missing fileutils require 5b4e7c3
Feb 25, 2010
Jeremy Kemper Missed singleton_class 3a3fa7f
Jeremy Kemper Use Object#singleton_class instead of #metaclass. Prefer Ruby's choice. 63a7ef0
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 <s@sikachu.com>
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
268c904
Jeremy Kemper Fill in for I18n.normalize_translation_keys removed from 0.3.4 5695b1b
Feb 26, 2010
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 <jose.valim@gmail.com>
b06e5dc
Jeremy Kemper Deprecate toplevel plugins tasks in favor of lib/tasks for Rails 3 fo…
…rward compat
ed7322f
Jeremy Kemper Add *.gem, pkg, and .bundle to .gitignore. Remove globs that should b…
…e in user's global ignores.
f4ce042
Jeremy Kemper Typo: _tasks -> _paths f56a163
Mar 01, 2010
Bryan Helmkamp Bump version constants to 2.3.6 to more easily support generating pre…
…release gems
1e64cdf
Mar 02, 2010
Jeremy Kemper Deprecate omitting the leading slash on a path arg to assert_redirect…
…ed_to
3969148
Mar 05, 2010
Santiago Pastorino 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 <jeremy@bitsweat.net>
d3a8152
Stijn Mathysen 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 <jeremy@bitsweat.net>
f6f75e8
Mar 06, 2010
Aaron Patterson converting inject to each and map
[#4119 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
5a806f6
Mar 09, 2010
Jeremy Kemper Disprefer JSONGem decoder since it only decodes JSON objects abb8fbd
Mar 10, 2010
Sam Ruby Add deprecation warning for overwrite_params and remove rdoc
[#4073 state:committed]

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

[#4174]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
056f957
Jeremy Kemper read_ and write_fragment cache preserve html safety yet cache strings…
… only
9b209e8
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.

[#2831]

Signed-off-by: Yehuda Katz <wycats@gmail.com>
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
b99914c
Mar 15, 2010
Jeremy Kemper to_str works here b3d32a5
Santiago Pastorino object_and_class_ext_test warnings removed
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ebf300f
Mar 16, 2010
Santiago Pastorino 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 <jose.valim@gmail.com>
374e49b
Manfred Stienstra Improve performance of Multibyte::Utils.
Replace explicit for-loops by faster enumeration methods.

[#3158]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2d3c580
James Golick 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 <jeremy@bitsweat.net>
27aa228
Santiago Pastorino translation method of TranslationHelper module returns always SafeBuf…
…fer [#4194 status:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2310aef
Santiago Pastorino scope_key_by_partial fix for Ruby 1.9 when there's virtual_path
[#4202 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9cfa875
Jeremy Kemper Bundler returns a Pathname from #loaded_from; work around it f175d19
Jeremy Kemper Don't rely on Active Support being loaded here c0137f6
Mar 22, 2010
Bruno Michel button_to should generate an html_safe string
Signed-off-by: Michael Koziarski <michael@koziarski.com>
26f2cce
Santiago Pastorino ActionView::SafeBuffer should be there for backwards compatibility [#…
…4241 state:committed]

Signed-off-by: Michael Koziarski <michael@koziarski.com>
629afe9
Mar 25, 2010
Tom Lea 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 <jose.valim@gmail.com>
97e07a8
Rodrigo Kochenburger Set mailer template_root as absolute path [#2263 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
0022fa3
Emilio Tagua Allow deprecation messages with or without a final period.
Signed-off-by: José Valim <jose.valim@gmail.com>
ac7b5a2
Mar 26, 2010
José Valim Added compatibility to Ruby 1.9.2. 157c180
Mar 27, 2010
Joe Rafaniello 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 <wycats@gmail.com>
c1b2200
Mar 28, 2010
Santiago Pastorino Time marshalling backported [#4286 state:committed]
Signed-off-by: wycats <wycats@gmail.com>
cf7ed7c
Santiago Pastorino flatten not needed here
Signed-off-by: wycats <wycats@gmail.com>
0f18904
Santiago Pastorino backport of inconsistency with cattr_reader and matter_reader with so…
…me tweaks

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

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
03d5d0b
Ernie Miller belongs_to associations now honor :primary_key option for joins
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
00b95eb
Joey Aghion use supplied primary key when eager-loading belongs_to associations r…
…ather than default primary key

[#765]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
715b34f
Mar 30, 2010
Dudley Flanders Trivial doc update on nested attributes delete renaming
Signed-off-by: José Valim <jose.valim@gmail.com>
bf563bd
Fixed a bug where create_table could not be called without a block [#…
…2221 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
ea6ef76
Juanjo Bazán new assertion: assert_blank
Signed-off-by: Xavier Noria <fxn@hashref.com>
ccb1bee
Juanjo Bazán New assertion: assert_present
Signed-off-by: Xavier Noria <fxn@hashref.com>
4b08679
Santiago Pastorino Don't cache the utc_offset we are already caching the timezone [#4301]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
e329eab
Xavier Noria avoid method redefined; discarding old empty? warning [Santiago Pasto…
…rino]
a0454dc
Mar 31, 2010
Pratik Dont try to load the record from the db if preloading didn't find any…
…thing
0e57c70
Pratik Dont use Rails 3 finder syntax in Rails 2.3.x test [#4303 state:resol…
…ved]
1f44fc9
David Heinemeier Hansson Added Object#presence that returns the object if it's #present? other…
…wise returns nil [DHH/Colin Kelley]
1668ad3
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
aa48c79
Apr 02, 2010
Santiago Pastorino utc_offset is no longer required on TimeZone and if it's not supplied…
… we delegate to TZInfo
de7925d
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 <jeremy@bitsweat.net>
e617af1
Parameterize should accept malformed utf8 characters [#4323 state:res…
…olved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
642d5d2
Apr 06, 2010
Simon Effenberg remove_index now uses quote_table_name() [#4300 state:resolved]
Signed-off-by: Michael Koziarski <michael@koziarski.com>
1d73682
Santiago Pastorino Generate routes for nested resources with nil object raise RoutingErr…
…or [#4262 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
cfb31ed
Apr 08, 2010
David Heinemeier Hansson Fixed that default locale templates should be used if the current loc…
…ale template is missing [DHH]
0653a6d
Apr 09, 2010
Rolf Bjaanes Changed the way inflections for uncountables work for 'funky jeans'
Signed-off-by: José Valim <jose.valim@gmail.com>
fcec740
José Valim Fix tests broken in 0653a6d f87a518
Santiago Pastorino fix stack trace lines on class_eval
Signed-off-by: José Valim <jose.valim@gmail.com>
958b0e9
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 <jose.valim@gmail.com>
dae2473
Yaroslav Markin Fix Array#to_xml to produce valid markup when working with namespaced…
… classes [#3624 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
a84e9b4
Apr 12, 2010
Anil Wadghule Fix for plugin not getting installed on Windows environment [#4320 st…
…ate:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
c69dc1a
Apr 14, 2010
Pratik Ensure not to load the entire association when bulk updating existing…
… records using nested attributes
5efb150
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 <pratiknaik@gmail.com>
18ba648
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:

    "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>
c519215
Jeremy Kemper Distinguish test for 1.8.6 compat c55cdd8
Apr 17, 2010
Mislav Marohnić `String#starts/ends_with?` should return false for non-string argumen…
…t, not raise error

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
4b36daf
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
2401af4
Apr 20, 2010
Santiago Pastorino TimeZones lazy load
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
49943a7
Apr 21, 2010
Santiago Pastorino load tzinfo on initialize only
Signed-off-by: Xavier Noria <fxn@hashref.com>
d891754
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]
c401102
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 <wycats@gmail.com>
cec44f5
Jeremy Kemper PostgreSQL: use standard-conforming strings if possible c9e1570
Jeremy Kemper PostgreSQL: remove the unnecessary heuristic checking whether the val…
…ue is escaped
5c0ad82
Jeremy Kemper Remove quoted_string_prefix entirely since PostgreSQL was the only da…
…tabase adapter relying on it.
457a546
Jeremy Kemper Ruby 1.9: ERB template encoding using a magic comment at the top of t…
…he file
81e0607
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
fb545f4
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
f6e71c6
Cezary Baginski actionpack: added missing encoding comments [#4466 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ec7716a
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 <santiago@wyeworks.com>
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
aa401bd
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
objects.

[#1966 state:committed]

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

Signed-off-by: José Valim <jose.valim@gmail.com>
dcf0f97
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 <jeremy@bitsweat.net>
0d767fd
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 <jeremy@bitsweat.net>
6dbc75f
Jatinder Singh AR JSON Serializer now supports custom root option.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
aeff171
Pratik Use primary key in conditions, not 'id' [#4395 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>

Conflicts:

	activerecord/test/cases/nested_attributes_test.rb
f194d65
Brian Lopez add support for mysql2 adapter to dbconsole
[#4532 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
6d1344d
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 <jeremy@bitsweat.net>
adcfb4e
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 <jeremy@bitsweat.net>
f967b35
May 08, 2010
Emili Parreño Add index length support for MySQL [#1852 state:resolved]
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>
3616141
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.
eababa3
May 09, 2010
Pratik Revert "Revert "Add index length support for MySQL [#1852 state:resol…
…ved]" (breaks the build)"

This reverts commit eababa3.
77adb4b
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@bitsweat.net>
ad73a3a
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 <jeremy@bitsweat.net>
c4ef7bb
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 <jose.valim@gmail.com>
8e7a64d
Jeff Kreeftmeijer partial counters with :as [#2804 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2de3646
Neeraj Singh db:drop:all throws error when database does not exist [#2997 state:re…
…solved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
22b020d
Jeff Kreeftmeijer make sure `as` is set before trying to build an #{as}_counter. [#2804
…state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
5d7ad7b
Lawrence Pit docs + test for each_error
[#3185 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
0706bdc
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 <jose.valim@gmail.com>
ddadcc7
Jeff Kreeftmeijer 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>
3568c5c
Neeraj Singh Fix broken integration test in 2.x [#4565 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
3570f3e
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 <jose.valim@gmail.com>
e535b45
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 <jose.valim@gmail.com>
5d979de
Jeff Kreeftmeijer Added assert_attribute_type to clean up GeneratedAttributeTest [#2377
…state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
ec017e1
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 <jose.valim@gmail.com>
5b1f4c5
Rizwan Reza Rack dependency bumped to 1.1.0, tests passing. [#3558 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
74206ae
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…
…ommitted]

Signed-off-by: Xavier Noria <fxn@hashref.com>
32b0b5f
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 <jose.valim@gmail.com>
a5696e3
É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@bitsweat.net>
99bcce7
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.

Conflicts:

	activerecord/test/cases/migration_test.rb

[#3234 state:open]
9d99e61
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 <fxn@hashref.com>
a637b5f
Jeremy Kemper Remove miscommit from 57337cd d8f0a58
Jeremy Kemper 2.3.6 release 56bb550