Skip to content
This repository
  • 1,207 commits
  • 301 files changed
  • 96 comments
  • 59 contributors
This comparison is big! We're only showing the most recent 250 commits
Jan 12, 2011
Xavier Noria upgrades RDoc and horo dependencies
RDoc 2.x was missing some stuff, let's align this with master
5de1314
Santiago Pastorino Allow generators nested in more than one level 3667438
Aaron Patterson include_in_memory? should check against @target list in case of new r…
…ecords. [#6257 state:resolved]
10fa49b
Jan 13, 2011
Santiago Pastorino Add missing require 0f5e815
Santiago Pastorino One more missing require f4dcf19
Santiago Pastorino sorry, the CI cannot lie to us anymore (Part II) 460f173
Jan 16, 2011
Aaron Patterson updating sqlite3-ruby => sqlite3 9d87f41
Jon Leighton Added deprecation warning for has_and_belongs_to_many associations wh…
…ere the join table has additional attributes other than the keys. Access to these attributes is removed in 3.1. Please use has_many :through instead.
bcbff10
Jan 17, 2011
Aaron Patterson minitest added @__io__, so we should ignore it too a58670b
Jan 18, 2011
Michael Koziarski Use the derived request_method from AD::Request rather than the raw R…
…EQUEST_METHOD from rack.

This takes _method into account so the log shows the method which ActionController sees.
64c1cb3
Aaron Patterson Changing sqlite3-ruby to sqlite3. backporting 8f88a28 to 3-0-stable. 97d4766
Jan 19, 2011
Jamis Buck make TestCaseTest work for pre-1.9 rubies, too fd19ade
Jamis Buck scrub instance variables from test cases on teardown
this prevents test state from accumulating, resulting in leaked
objects and slow tests due to overactive GC.
1e98920
Jamis Buck rein in GC during tests by making them run (at most) once per second
this can provide a significant performance boost during testing, by
preventing the GC from running too frequently.
35984f5
Added a testcase for bug [#5329]
Signed-off-by: José Valim <jose.valim@gmail.com>
b4bc49c
José Valim Solve SystemStackError when changing locale inside ActionMailer [#5329
…state:resolved]
46b23f8
Jamis Buck Revert "rein in GC during tests by making them run (at most) once per…
… second"

This reverts commit 35984f5.
039b807
Jamis Buck Revert "scrub instance variables from test cases on teardown"
This reverts commit 1e98920.
e5664b5
Jamis Buck Revert "make TestCaseTest work for pre-1.9 rubies, too"
This reverts commit fd19ade.
683cb50
Jan 24, 2011
Aaron Patterson Merge remote branch 'jonleighton/deprecate_habtm_attributes-3-0-stabl…
…e' into 3-0-stable

* jonleighton/deprecate_habtm_attributes-3-0-stable:
  Added deprecation warning for has_and_belongs_to_many associations where the join table has additional attributes other than the keys. Access to these attributes is removed in 3.1. Please use has_many :through instead.
f420c2e
Jan 28, 2011
Santiago Pastorino Bump mail version up 5f509c2
Jan 30, 2011
Mikel Lindsaar Fix gitignore to ignore tmp/ correctly, credit telemachus 54e72a5
Jan 31, 2011
Michael Koziarski Prepare for the 3.0.4 release 0cbf9b2
José Valim Fix AM tests 0448247
Feb 01, 2011
Michael Koziarski Be sure to javascript_escape the email address to prevent apostrophes…
… inadvertently causing javascript errors.

This fixes CVE-2011-0446
e3dd210
José Valim Ensure render is case sensitive even on systems with case-insensitive…
… filesystems.

This fixes CVE-2011-0449
6f80224
José Valim Use Mime::Type references. ad9d21d
Aaron Patterson limit() should sanitize limit values
This fixes CVE-2011-0448
354da43
Michael Koziarski Change the CSRF whitelisting to only apply to get requests
Unfortunately the previous method of browser detection and XHR whitelisting is unable to prevent requests issued from some Flash animations and Java applets.  To ease the work required to include the CSRF token in ajax requests rails now supports providing the token in a custom http header:

 X-CSRF-Token: ...

This fixes CVE-2011-0447
66ce384
Michael Koziarski Make rails.js include the CSRF token in the X-CSRF-Token header with …
…every ajax request.
7b64ade
Akira Matsuda Make before_type_cast available for datetime fields
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
c8b7606
Akira Matsuda before_type_cast on Datetime tests for Mysql2Adapter
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
4e6a102
Saimon Moore Additionally trigger i18n configuration setup before any eager loading [
#6353 state:resolved]

This handles the case where config.cache_classes is true and classes
are loaded before the I18n load path has had a chance to be populated.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
979f38a
Saimon Moore Ensure I18n setup is only executed once if triggered on eager loading [
…#6353 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
effb582
Feb 02, 2011
Raimonds Simanovskis fix for test_read_attributes_before_type_cast_on_datetime - Oracle ad…
…apter also returns Time value
8a73ebb
Feb 03, 2011
Add a test for 'render :layout'
To make sure it will show block contents if it is placed after 'render
:partial'

[#5557 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
53b0235
Ken Collins The type_cast_calculated_value method will trust DB types before cast…
…ing to a BigDecimal.

[#6365 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
068527b
Feb 04, 2011
Edward Faulkner Fixing ordering of HABTM association deletion [#6191 state:resolved]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e142159
Santiago Pastorino git am is better here d00ed5a
Santiago Pastorino Remove stupid mistake f2d0257
Feb 08, 2011
Aaron Patterson comma limits do not make sense on oracle or pg ff00cd2
Feb 09, 2011
Michael Koziarski Prepare for the 3.0.4 release 1081ea6
Michael Koziarski Merge branch '3-0-4-security' into 3-0-stable 84d608b
Xavier Noria adds RedCloth to the Gemfile, and defines a :doc group 27b8fb5
Josh Kalderimis fix for AS Gzip returning a UTF-8 string in Ruby 1.9 when it is actua…
…lly binary [#6386 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
31690ea
Add missing require 54dca98
Ken Collins Allow limit values to accept an ARel SQL literal. 7530c52
Xavier Noria getting started guide: the generated application README has no extension 01ca46b
Xavier Noria now that the API guidelines are a guide, it is enough to assert that …
…the names of Rails components have a space, no need to say it was checked with David in the past
3306314
Feb 11, 2011
Carlos Antonio da Silva Add missing deprecation require
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
401ee98
Aaron Patterson skip this test on mysql2 as well 4433b50
Aaron Patterson no more text-format for Ruby 1.9 compatibility cab7cb4
Aaron Patterson psych does not emit a space after the type 4dc5505
Feb 12, 2011
Josh Kalderimis Fixes an issue when decoding a json string which looks like a date bu…
…t is invalid. This DateTime parse error is now caught and the original string is instead passed back [#6286 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e605165
Josh Kalderimis Updated the json date regex to recognize xmlschema formatted date tim…
…es during json decoding. [#3031 state:resolved]

Signed-off-by: Santiago Pastorino and Emilio Tagua <santiago+emilioe@wyeworks.com>
73b9e43
Akira Matsuda avoid nil.dup
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
6e04f58
Akira Matsuda do not to_s where you are testing that a string value is stored for t…
…he before_type_cast

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
cb045c0
Carlos Antonio da Silva Add tests showing the LH issue #6381: fields_for with inline blocks a…
…nd nested attributes already persisted

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
640b1f0
Santiago Pastorino Backport fix from master: fields_for with inline blocks and nested at…
…tributes already persisted does not render properly

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
4145810
Wojciech Wnętrzak added proper require for ruby-debug19 gem to generated Gemfile
[#6419 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
9c6f9c9
Santiago Pastorino Make gem "ruby-debug19" require ruby-debug 22d1fee
Ernie Miller Deprecate Relation#& alias for Relation#merge 66003f5
Feb 13, 2011
Jon Leighton Deprecated support for interpolated association conditions with the :…
…conditions => 'foo = #{bar}' syntax, and added the new interpolation syntax which is :conditions => proc { "foo = #{bar}" }.
756e70c
Andrew White Fix assert_recognizes with block constraints [#5805 state:resolved] e9ae88a
Andrew White Remove incorrect assert_recognizes example cb9745b
Feb 14, 2011
Andrew White Remove incorrect assert_recognizes example c6ab3d1
Andrew White Add notes on how to override the default :id constraint [#5994 state:…
…resolved]
b4205b4
Andrew White Fix named route helper for routes nested inside deeply nested resources
[#6416 state:resolved]
64ca278
Andrew White Add test to prevent regression on namespace root nested in a resource
[#6389 state:resolved]
abea073
Aaron Patterson Merge remote branch 'jonleighton/deprecate_string_interpolation-3-0-s…
…table' into 3-0-stable

* jonleighton/deprecate_string_interpolation-3-0-stable:
  Deprecated support for interpolated association conditions with the :conditions => 'foo = #{bar}' syntax, and added the new interpolation syntax which is :conditions => proc { "foo = #{bar}" }.
2b8fad6
Feb 15, 2011
Sergii Boiko fixed broken link to postgresql docs
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e08873f
Joel Nimety GcTime incorrectly checks GC.respond_to?(:total_time), it should chec…
…k GC::Profiler.respond_to?(:total_time)

[#6435 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
0cee303
Feb 16, 2011
handle double pluralization for irregular plurals
[#6363]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e925acb
Timothy N. Tsvetkov Fixed issue #6363, avoid to pluralized already pluralized names and s…
…ingularize a single in generators, for example stadia is a valid plural for stadium. But calling pluralize for stadia will return stadias which sematically is not corrent in this case

[#6363 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
149c3d6
Aaron Patterson explicitly anding queries of the same column 41c35ab
Feb 17, 2011
Aaron Patterson updating changelog ff5db18
Feb 18, 2011
Frederick Cheung Change validates inclusion to use cover? for Ranges in ruby 1.9 [#6453
…state:committed]

Signed-off-by: Xavier Noria <fxn@hashref.com>
d7b539a
Feb 21, 2011
Aaron Patterson Gem.cache is going to be deprecated, use source_index instead 3ab82d8
Aaron Patterson adding a test case for custom locking ac73f50
Feb 22, 2011
Aaron Patterson silencing deprecation spam 30a0e3f
Kamal Fariz Mahyuddin Fix observer callbacks firing multiple times on descendant instances ee491b0
Aaron Patterson updating to 3.0.5.rc1 ef31b87
Feb 23, 2011
Michael Koziarski Prepend the CSRF filter to make it much more difficult to execute app…
…lication code before it fires.
90aede6
Aaron Patterson observers leak across tests, so rather than modify the object, we sho…
…uld just count the number of times the observer was called
77d4211
Feb 25, 2011
Prem Sichanugrist Make sure that we set `env["action_dispatch.show_exceptions"]`
This has been used by `show_exception` middleware even the setting wasn't get passed to `env` hash.

(This is the backported version to 3-0-stable)
69c0bad
Prem Sichanugrist Always use ActionDispatch::ShowExceptions middleware [#6462 state:res…
…olved]

This will make sure the application will raise `ActionController::RoutingError` in case "X-Cascade: pass" header was set, usually when there's no route match.

(This is a backported version to 3-0-stable)
2a67e69
Feb 26, 2011
Aaron Patterson prepping for 3.0.5 release ecc6bb5
Aaron Patterson Merge branch '3-0-5' into 3-0-stable
* 3-0-5:
  prepping for 3.0.5 release
ef5e817
Feb 27, 2011
Santiago Pastorino Bump i18n version f7e1703
Santiago Pastorino failing test for i18n key collision with namespaced models d043d20
Santiago Pastorino Revert "Properly interpolate i18n keys in modules [#5572 state:resolv…
…ed]"

This breaks #6448, you should use :"module/class" as key for namespacing
[#6448 state:committed]

This reverts commit 8d14fa8.
f80eea3
Feb 28, 2011
Sven Fuchs Make TranslationHelper#translate use the :rescue_format option in I18…
…n 0.5.0 (backports 896e25e)

Don't catch exceptions here. Instead only declare that we want exceptions to be rescued as :html, but also let users configure reactions to exceptions in I18n.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
1452571
Santiago Pastorino Add a test for passing :rescue_format => nil to #translate
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
ff95f85
Santiago Pastorino javascript_include_tag shouldn't raise if you register an expansion k…
…ey with nil or [] value
4c681f6
Josh Kalderimis updated Time, Date and DateTime current methods in AS to use Time.zon…
…e and not Time.zone_default.

[#6410 state:committed]
9ba0c7e
Josh Kalderimis Updated the AS guides with some information on the difference between…
… Date.today and Date.current.
7180a32
Aaron Patterson use a subclass of AS::TZ for testing html output cdfee85
Mar 02, 2011
Cheah Chu Yeow Fix Action caching bug where an action that has a non-cacheable respo…
…nse always renders a nil response body. It now correctly renders the response body.

Note that only GET and HTTP 200 responses can be cached.

[#6480 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
beec6c8
Santiago Pastorino Add missing versions to CHANGELOGs ea026f1
Santiago Pastorino Add some CHANGELOG entries for 3.0.6 45d5663
Mar 04, 2011
José Valim log and readme should respect --quiet eff41a2
Mar 06, 2011
Andrew White Raise ArgumentError if route name is invalid [#6517 state:resolved] 2437c78
Andrew White Improve testing of cookies in functional tests:
- cookies can be set using string or symbol keys
- cookies are preserved across calls to get, post, etc.
- cookie names and values are escaped
- cookies can be cleared using @request.cookies.clear

[#6272 state:resolved]
e2523ff
Andrew White Report the correct value of nil.id in the exception message
as different ruby implementations may have different values,
for example Rubinius returns 53 for nil.id.

[#6444 state:resolved]
824107b
Mar 09, 2011
Andrew White Filter params that return nil for to_param 8dab7e5
Mar 11, 2011
Xavier Noria Filter sensitive query string parameters in the log [#6244 state:comm…
…itted]

This provides more safety to applications that put secret information in the query string, such as API keys or SSO tokens.

Signed-off-by: Xavier Noria <fxn@hashref.com>
434e451
Xavier Noria remove item in CHANGELOG that leaked in a merge c1f2d9b
Mar 12, 2011
adds a couple of missing AS dependencies 30dd123
Santiago Pastorino require 'thread' in order to use Mutex 4a26cd0
Andrew White Fixed a bug when empty? was called on a grouped Relation that wasn't …
…loaded

[#5829 state:resolved]
3a22e74
Andriy Tyurnikov length validation for fixnums
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
01cb81a
Santiago Pastorino Add CHANGELOG entry 'Fix length validation for fixnums' 0d1ca43
Mar 13, 2011
Andrew White Remove invalid test
The test fails on PostgreSQL when trying to load the records as
the comments_count field is not included in the GROUP BY clause.
c2b474a
Mar 16, 2011
Santiago Pastorino Refactor length validation 1cbade3
Josh Kalderimis fixes an issue with number_to_human when converting values which are …
…less than 1 but greater than -1 [#6576 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
7c8a5f5
Santiago Pastorino Add number_to_human CHANGELOG entry cb2c5c5
Robert Pankowecki Fix when database column name has some symbolic characters. [#5818 st…
…ate:resolved]
c75e4ae
Santiago Pastorino Add AMo CHANGELOG entry 665065c
Mar 17, 2011
Santiago Pastorino Sync attribute_methods.rb with master code, tests added
[#6580 state:committed]
691530a
Santiago Pastorino Update CHANGELOG entry 5ec7806
Mar 21, 2011
Iain Hecker Reapply extensions when using except and only b8ff5f0
Aaron Patterson updating ar changelog e508d9e
Aaron Patterson schemas set by set_table_name are respected by the mysql adapter. [#5322
state:resolved]
eb1eac9
Aaron Patterson oops, forgot to commit this test! 66c8c6c
Aaron Patterson escaping binary data encoding when inserting to sqlite3. Thanks Narus…
…e! [#6559 state:resolved]
7222786
Mar 22, 2011
Santiago Pastorino Do not in place modify what table_name returns 7717fc3
Santiago Pastorino Allow to read and write AR attributes with non valid identifiers 1b7b724
Santiago Pastorino use class_eval with a string when it's possible 63dca41
Mar 23, 2011
Murray Steele Failing test case to show that habtm join table contents are removed …
…when a model is destroyed but the destruction is blocked by a before_destroy.
2f30cdc
Murray Steele Make clearing of HABTM join table contents happen in an after_destory…
… callback.

The old method of redefining destroy meant that clearing the HABTM join table would happen as long as the call to destroy succeeded.  Which meant if there was a before_destroy that stopped the instance being destroyed using normal means (returning false, raising ActiveRecord::Rollback) rather than exceptional means the join table would be cleared even though the instance wasn't destroyed.  Doing it in an after_destroy hook avoids this and has the advantage of happening inside the DB transaction too.
5d43977
Adam Meehan Fix before_type_cast for timezone aware attributes by caching convert…
…ed value on write. Also remove read method reload arg on timezone attributes.
0823bbd
Andrew White Fix filter :only and :except with implicit actions
The method_name argument is "default_render" for implicit actions
so use the action_name attribute to determine which callbacks to run.

[#5673 state:resolved]
35de70f
Mar 24, 2011
Josh Kalderimis correction to the outputted controller name in the diagnostics error …
…template, test included

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
c6b3b89
Mar 26, 2011
Jesse Storimer Correct docs for after_find and after_initialize 9d7ef79
Aaron Patterson fixing whitespace errors. :bomb: 7643dfd
Aaron Patterson adding a test for attributes after type cast. thanks nragaz. :heart: f28b08a
Aaron Patterson refactoring tz to a variable rather than repeating it c9708ad
Aaron Patterson cleaning up typecast test a little 004fc1c
Mar 28, 2011
Jeremy Kemper Cheaper attribute reads and respond_to?. Add underscore-prefixed meth…
…od aliased to the attribute name so it can be overridden but still called internally.
86acbf1
Sebastian Martinez Un-deprecate #reorder method
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
235a414
Aaron Patterson updating AR changelog 90e9f2c
Aaron Patterson bumping version to 3.0.6.rc1 f13fe8f
Mar 29, 2011
Prem Sichanugrist Do not show optional (.:format) block for wildcard route [#6605 state…
…:resolved]

This will make the output of `rake routes` to be correctly match to the behavior of the application, as the regular expression used to match the path is greedy and won't capture the format part by default

This commit is the second attempt on fixing the issue, as the regular expression on another commit on `master` was invalid.
2dc297d
Andrew White Change exists? so that it doesn't instantiate records [#6127 state:re…
…solved]
827e5de
Andrew White Delegate any? and many? to scoped 7f098a6
Andrew White Quote find_in_batches ORDER BY clause [#6620 state:resolved] 3ed8a33
José Valim Pass the proper method_name instead of hardcoding to action_name. 4e2bacd
Aaron Patterson Revert "Improve testing of cookies in functional tests:"
This reverts commit e2523ff.
ba117b2
Patrick Bacon Added back the use of the Reflection module's cached sanitized_condit…
…ions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.
03852b6
Mar 30, 2011
Santiago Pastorino Bring back i18n_key to avoid regression e413953
Santiago Pastorino Bring back i18n_key to avoid regression 05f3df3
Aaron Patterson Merge branch 'eager_load_has_one_with_conditions_fix' of https://gith…
…ub.com/baconpat/rails into baconpat-eager_load_has_one_with_conditions_fix

* 'eager_load_has_one_with_conditions_fix' of https://github.com/baconpat/rails:
  Added back the use of the Reflection module's cached sanitized_conditions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.
1f38cd7
Patrick Bacon Added back the use of the Reflection module's cached sanitized_condit…
…ions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.
d6dbd54
Support both conventions for translations for namespaced models.
3.0.0 - 3.0.1 required 'namespace/model'
3.0.2 - 3.0.5 required 'namespace.model' (nested). It has the advantage of
keeping the i18n file DRY when multiple models are in the same namespace,
but can lead to translation key conflicts if models are nested within
models.

[#6448, #5572]
5b8dbb0
Support both conventions for translations for namespaced models.
3.0.0 - 3.0.1 required 'namespace/model'
3.0.2 - 3.0.5 required 'namespace.model' (nested). It has the advantage of
keeping the i18n file DRY when multiple models are in the same namespace,
but can lead to translation key conflicts if models are nested within
models.

[#6448, #5572]
0307c53
Aaron Patterson bumping to 3.0.6.rc2 b13be61
Apr 05, 2011
Durran Jordan Destroying records via nested attributes works independent of reject_if:
- When a :_destroy truthiness is provided in the attributes hash, the
  record should get destroyed regardless of the result of the proc or
    method supplied to :reject_if. (If :allow_destroy is true)

[#6006 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
30264bb
Josh Kalderimis remove AM delegating register_observer and register_interceptor to Ma…
…il and instead implement smarter versions allowing for string class names, also added proper Railtie support with tests

Signed-off-by: José Valim <jose.valim@gmail.com>
e6bc818
Aaron Patterson do not return html safe strings from auto_link 61ee344
Aaron Patterson updating CHANGELOG for actionpack 6bb9efe
Aaron Patterson updating CHANGELOG 857ec16
Aaron Patterson bumping version to 3.0.6 38df020
Aaron Patterson Merge branch '3-0-6' into 3-0-stable
* 3-0-6:
  bumping version to 3.0.6
  updating CHANGELOG
  updating CHANGELOG for actionpack
  do not return html safe strings from auto_link
  bumping to 3.0.6.rc2
  Support both conventions for translations for namespaced models.
  Added back the use of the Reflection module's cached sanitized_conditions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.
  Bring back i18n_key to avoid regression
  Revert "Improve testing of cookies in functional tests:"
  bumping version to 3.0.6.rc1
  updating AR changelog
3940e34
Apr 14, 2011
André Arko attributes no longer disappear if a tag contains whitespace
old:
Hash.from_xml("<tag foo='bar'>\n</tag>")
=> {"tag"=>"\n"}

new:
Hash.from_xml("<tag foo='bar'>\n</tag>")
=> {"tag"=>{"foo"=>"bar", "__content__"=>"\n"}
b41d8f3
André Arko gsub is not needed (thanks @fxn!) 45683fb
André Arko files are a special case and need whitespace to be significant 3d15019
Stian Grytøyr Fixes performance issue introduced in 3.0.6 (issue #6695) a3639be
Santiago Pastorino Add missing CHANGELOG entries 6bc9dd7
Santiago Pastorino Prepare for the 3.0.7.rc1 release 1787447
Emilio Tagua Fix console to accept [environment] [options] as specified in docs. 7d2f472
Apr 15, 2011
Jon Leighton Remove unnecessary code from define_read_method and add assertion to …
…make sure the underscored version is actually generated
36691ac
Jon Leighton Return nil from read_attribute if _foo is defined, but @attributes ha…
…s no 'foo' key. Fixes breakage in test_find_only_some_columns on Ruby 1.9 which was introduced in a3639be.
912e5ff
Jon Leighton Backported 14b880f (Fix various issues with the :primary_key option i…
…n :through associations)
9f5ab9a
Jon Leighton Undo performances regressions I introduced in 36691ac and add test fo…
…r an edge case. Add comments to explain the intent of the code. Also fix the code (which previously worked differently on 1.8 and 1.9 due to Symbol#=~ being always false on 1.8)."
1302443
Jon Leighton Backport test assertions from 65469a6 (the behaviour is already the s…
…ame, but we need to assertions to guard against regressions)
bd0fe87
Jon Leighton Update CHANGELOG df6117e
Jon Leighton Remove unnecessary code from define_read_method and add assertion to …
…make sure the underscored version is actually generated
ef95df7
Jon Leighton Return nil from read_attribute if _foo is defined, but @attributes ha…
…s no 'foo' key. Fixes breakage in test_find_only_some_columns on Ruby 1.9 which was introduced in a3639be.
3609642
Jon Leighton Undo performances regressions I introduced in 36691ac and add test fo…
…r an edge case. Add comments to explain the intent of the code. Also fix the code (which previously worked differently on 1.8 and 1.9 due to Symbol#=~ being always false on 1.8)."
ef88c0c
Jon Leighton Backport test assertions from 65469a6 (the behaviour is already the s…
…ame, but we need to assertions to guard against regressions)
364a5d4
Jon Leighton Update CHANGELOG 20354b7
Andrew White Add missing CHANGELOG entries 612afa2
Sebastian Martinez Added missing CHANGELOG entries for 3.0.7
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
de42af7
Santiago Pastorino Prepare for the 3.0.7.rc2 release f96ad0d
Apr 16, 2011
Mikel Lindsaar Updating mail to 2.2.16 2bd5e02
Apr 18, 2011
Arun Agrawal File should be open in read/write mode. When doing lock on a file. c6c46e1
Aaron Patterson adding a rake task to update CHANGELOG dates ff3cff8
Aaron Patterson bumping version for release 2c32601
Aaron Patterson Merge branch '3-0-7' into 3-0-stable
* 3-0-7:
  bumping version for release
  adding a rake task to update CHANGELOG dates
  Prepare for the 3.0.7.rc2 release
  Added missing CHANGELOG entries for 3.0.7
  Add missing CHANGELOG entries
  Update CHANGELOG
  Backport test assertions from 65469a6 (the behaviour is already the same, but we need to assertions to guard against regressions)
  Undo performances regressions I introduced in 36691ac and add test for an edge case. Add comments to explain the intent of the code. Also fix the code (which previously worked differently on 1.8 and 1.9 due to Symbol#=~ being always false on 1.8)."
  Return nil from read_attribute if _foo is defined, but @attributes has no 'foo' key. Fixes breakage in test_find_only_some_columns on Ruby 1.9 which was introduced in a3639be.
  Remove unnecessary code from define_read_method and add assertion to make sure the underscored version is actually generated

Conflicts:
	activerecord/CHANGELOG
9382cb4
Aaron Patterson adding a rake task to help generate changelog notes for release annou…
…ncements
d9bca64
Apr 19, 2011
José Valim Avoid define_method if possible. afcdf9b
correct links to rack articles 1f92d13
Rohit Arondekar Guides: Add test directory to load path to run individual test files. c1720fb
Apr 21, 2011
Pavel Forkert Added test case and fix for proper eager loading associations 3836dc6
Apr 23, 2011
Josh Kalderimis correction to the i18n locale filter examples 030a905
Apr 26, 2011
Mikel Lindsaar Update actionmailer to use Mail 2.2.19 922fb1d
José Valim Merged pull request #278 from miloops/fix_console.
Fix console to accept [environment] [options] as specified in docs.
8dcaf4d
Apr 28, 2011
Paul Kmiec perofrmance trumps syntactical sugar 92e4cfb
Apr 29, 2011
Aaron Patterson Merged pull request #347 from pkmiec/SyntacticalSugar30.
performance trumps syntactical sugar
1e19a05
José Valim Make postgresql faster on development (thanks to @tapajos). 69079a1
Aaron Patterson Merged pull request #351 from vijaydev/3-0-stable.
Update the github url for the verification plugin
d657b9e
Aaron Patterson Merged pull request #351 from vijaydev/3-0-stable.
Update the github url for the verification plugin
5663e63
Aaron Patterson only use mysql2 0.2.x with rails 3.0.x c751d84
Casey Dreier This patch ensures that an inner join performed to a polymorphic reso…
…urce joins on both the polymorphic_id and polymorphic_type fields.

Previously, the inner joins were merely joining on the polymorphic_id field.
b538e85
Casey Dreier This patch allows a user to join through a polymorphic has_one associ…
…ation to another has_one polymorphic association. This also includes a fix in to the Author model test to properly define two associations to taggings as a has_one and a has_many.
0525306
Apr 30, 2011
Vijay Dev update verification.git plugin url 6bcb352
May 03, 2011
Graeme Mathieson Add a couple of missing activesupport requires so AR::Migration can b…
…e used independently.
cd028aa
José Valim Merge pull request #383 from mathie/patch-1.
Extra requires for AR::Migration
957115f
May 06, 2011
José Valim Don't pluralize, camelize. 24fbc47
José Valim Revert "Pass the proper method_name instead of hardcoding to action_n…
…ame."

This commit was actually correct. The first parameter in process_action
is not necessarily the same as the action_name. Use action_name to
retrieve the action instead.

This reverts commit 4e2bacd.
9575db6
May 09, 2011
Sven Winkler Fix Issue #342 7a79ab7
José Valim Merge pull request #465 from sven-q/3-0-stable
Issue #342: AssetTagHelper ensures that files are in the wrong directory (again)
f1d09a2
May 10, 2011
Aaron Patterson removing splat flatten as we no longer support 1.8.6. fixes #485. Tha…
…nks @sztywny
840f0a9
Jon Leighton Merge pull request #352 from daphonz/polymorphic-join-sql-patch
Fixes for incorrect INNER JOIN through two polymorphic resources (NoMethodError: undefined method `to_sym' for nil:NilClass)
f156258
May 13, 2011
Doug Fales A patch so that http status codes are still included in logs even dur…
…ing an exception [#6333 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
56b6d7d
Aaron Patterson RedCloth will not install on 1.9.3 ea9ef39
Aaron Patterson use valid yaml in tests 00da7bc
Aaron Patterson use encoding name since SJIS is Windows-31J on 1.9.3 81535fa
Aaron Patterson test/unit in ruby trunk adds a new instance variable. YAY! 7775670
Aaron Patterson backport skip to the AR base class e4f48b9
Aaron Patterson supporting infinity and -infinity for timestamps in PG. fixes #544 dc2b999
May 14, 2011
Fix bug with empty CDATA not being handled in Hash.from_xml
Signed-off-by: José Valim <jose.valim@gmail.com>
849007f
May 16, 2011
Aaron Patterson simplifying buffered logger for easier and slightly more performant c…
…odes. pumpkin
a2b1be2
Aaron Patterson make sure log file is written in binary mode. fixes #497 f2c6f04
May 17, 2011
Michael Koziarski Make sure that 3.0.x apps generated reference a compatible mysql2 rel…
…ease.
2004fb9
Michael Koziarski Add a deprecation warning about config.action_view.debug_rjs.
Upgrading to 3.1 removes debug_rjs and upgraded apps will fail to start up.
b03da24
Aaron Patterson bumping gem dependency for arel on 3.0.x 78f855c
May 18, 2011
Xavier Noria set log encoding to BINARY, but still use text mode to output portabl…
…e newlines
a37ae63
May 23, 2011
Patrick Quinn Make Rake::DSL methods available within Railtie rake_tasks block
Fixes incompatibility introduced by Rake 0.9.0
83f257f
May 24, 2011
Arun Agrawal Fixed failing test against with 3-0-stable branch. 89252c4
José Valim Merge pull request #1266 from arunagw/deprecation_warning_3_0_fix
Deprecation warning 3 0 fix
f505565
Arun Agrawal Fixed failing tests. 17c9efb
José Valim Merge pull request #1269 from arunagw/fix_load_path_test_3_0
Fix load path test 3 0
f236dbf
Joey B Add failing test case for issue 796 d387a59
Aaron Patterson do not bother with assert_nothing_raised, the test will fail and we g…
…et a better trace without it
99cfdba
Aaron Patterson adding a test for create! with invalid associations f0c09f7
Aaron Patterson add tests surrounding behavior of save and save! for associations tha…
…t have validation errors
1c079c5
Aaron Patterson rescue record invalid exceptions and return false from the save metho…
…d. fixes #796
79abb70
Aaron Patterson make open_log private 2649db7
Santiago Pastorino Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0 352daff
Santiago Pastorino default_executable is deprecated since rubygems 1.7.0 79ed700
May 25, 2011
Aaron Patterson fixing psych support in big decimal, fixing tests to support YAML 1.1 929e5c4
Aaron Patterson prefering psych as the yaml parser if possible, fixing assertions for…
… YAML 1.1 compatibility
f55a171
Aaron Patterson load psych by default if possible 8e6b757
Aaron Patterson require Psych if possible, use Psych output when enabled 03f0f3c
Aaron Patterson load and prefer psych as the YAML parser when it is available e4594f7
Aaron Patterson use ! " " YAML string literal syntax rather than removing both quotes 5856fc5
Aaron Patterson add Psych::SyntaxError to the list of rescued YAML exceptions cae1d46
Aaron Patterson updating changelogs eecbc10
Aaron Patterson bumping to 3.0.8.rc1 8b0806e