Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Jan 31, 2011
@josevalim josevalim Fix AM tests 0448247
Commits on Feb 01, 2011
@amatsuda amatsuda Make before_type_cast available for datetime fields
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
c8b7606
@amatsuda amatsuda before_type_cast on Datetime tests for Mysql2Adapter
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
4e6a102
@saimonmoore saimonmoore 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
@saimonmoore saimonmoore Ensure I18n setup is only executed once if triggered on eager loading [
…#6353 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
effb582
Commits on Feb 02, 2011
@rsim rsim fix for test_read_attributes_before_type_cast_on_datetime - Oracle ad…
…apter also returns Time value
8a73ebb
Commits on Feb 03, 2011
Anton Astashov 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
@metaskills metaskills 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
Commits on Feb 04, 2011
@ef4 ef4 Fixing ordering of HABTM association deletion [#6191 state:resolved]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e142159
@spastorino spastorino git am is better here d00ed5a
@spastorino spastorino Remove stupid mistake f2d0257
Commits on Feb 08, 2011
@NZKoz NZKoz Merge branch '3-0-4-security' into 3-0-stable 84d608b
Commits on Feb 09, 2011
@fxn fxn adds RedCloth to the Gemfile, and defines a :doc group 27b8fb5
@tenderlove tenderlove comma limits do not make sense on oracle or pg ff00cd2
@joshk joshk 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
Santiago Pastorino and Emilio Tagua Add missing require 54dca98
@metaskills metaskills Allow limit values to accept an ARel SQL literal. 7530c52
@fxn fxn getting started guide: the generated application README has no extension 01ca46b
@fxn fxn 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
Commits on Feb 11, 2011
@carlosantoniodasilva carlosantoniodasilva Add missing deprecation require
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
401ee98
@tenderlove tenderlove skip this test on mysql2 as well 4433b50
@tenderlove tenderlove no more text-format for Ruby 1.9 compatibility cab7cb4
@tenderlove tenderlove psych does not emit a space after the type 4dc5505
Commits on Feb 12, 2011
@joshk joshk 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
@joshk joshk 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
@amatsuda amatsuda avoid nil.dup
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
6e04f58
@amatsuda amatsuda 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
@carlosantoniodasilva carlosantoniodasilva 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
@spastorino spastorino 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
Commits on Feb 13, 2011
@morgoth morgoth added proper require for ruby-debug19 gem to generated Gemfile
[#6419 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
9c6f9c9
@spastorino spastorino Make gem "ruby-debug19" require ruby-debug 22d1fee
@ernie ernie Deprecate Relation#& alias for Relation#merge 66003f5
@jonleighton jonleighton 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
@pixeltrix pixeltrix Fix assert_recognizes with block constraints [#5805 state:resolved] e9ae88a
@pixeltrix pixeltrix Remove incorrect assert_recognizes example cb9745b
Commits on Feb 14, 2011
@pixeltrix pixeltrix Remove incorrect assert_recognizes example c6ab3d1
@pixeltrix pixeltrix Add notes on how to override the default :id constraint [#5994 state:…
…resolved]
b4205b4
@pixeltrix pixeltrix Fix named route helper for routes nested inside deeply nested resources
[#6416 state:resolved]
64ca278
@pixeltrix pixeltrix Add test to prevent regression on namespace root nested in a resource
[#6389 state:resolved]
abea073
@tenderlove tenderlove 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
Commits on Feb 15, 2011
@cris cris fixed broken link to postgresql docs
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e08873f
@jnimety jnimety 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
Commits on Feb 16, 2011
Dan Pickett handle double pluralization for irregular plurals
[#6363]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e925acb
@tukan tukan 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
@tenderlove tenderlove explicitly anding queries of the same column 41c35ab
Commits on Feb 17, 2011
@tenderlove tenderlove updating changelog ff5db18
Commits on Feb 18, 2011
@fcheung fcheung Change validates inclusion to use cover? for Ranges in ruby 1.9 [#6453
…state:committed]

Signed-off-by: Xavier Noria <fxn@hashref.com>
d7b539a
Commits on Feb 21, 2011
@tenderlove tenderlove Gem.cache is going to be deprecated, use source_index instead 3ab82d8
Commits on Feb 22, 2011
@tenderlove tenderlove adding a test case for custom locking ac73f50
@NZKoz NZKoz Prepend the CSRF filter to make it much more difficult to execute app…
…lication code before it fires.
90aede6
@tenderlove tenderlove silencing deprecation spam 30a0e3f
Commits on Feb 23, 2011
@kamal kamal Fix observer callbacks firing multiple times on descendant instances ee491b0
@tenderlove tenderlove updating to 3.0.5.rc1 ef31b87
Commits on Feb 27, 2011
@tenderlove tenderlove prepping for 3.0.5 release ecc6bb5