Skip to content

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Commits on Nov 14, 2008
@lifo lifo Rails now requires rubygems 1.3.1 of higher. f58b0b2
@NZKoz NZKoz Merge branch 'master' into 2-2-stable 0b424da
Commits on Nov 15, 2008
@al2o3cr al2o3cr fix assignment to has_one :through associations.
Signed-off-by: Michael Koziarski <>
@willbryant willbryant Moved the * strings out of construct_finder_sql to a new default_sele…
…ct method so it can be overridden by plugins cleanly

Signed-off-by: Michael Koziarski <>
[#1371 state:resolved]
Commits on Nov 16, 2008
@NZKoz NZKoz Add text/plain to the browser_generated_types array as webkit and gec…
…ko can submit them.

For more information see:
@dhh dhh The inflector is meant to work on words not phrases -- dont confuse p…
…eople with a phrase example
Commits on Nov 17, 2008
Carlos Paramio Change usage of defined? to check the rubygems constant existance by …
…a rescue block on boot.rb for Ruby 1.9 compatibility

Signed-off-by: Jeremy Kemper <>
@jeremy jeremy Remove deprecated Gem.manage_gems 78e374d
@jeremy jeremy Prefer a feature check to a version check 6bfd0ac
@jeremy jeremy Explicitly require AS::Duration 3eb0d29
@jeremy jeremy Workaround lack of Mocha on 1.9 (hasn't been updated for minitest yet) 8789394
@jeremy jeremy Ruby 1.9 compat: CGI switched back to Tempfile b55fc0f
@jeremy jeremy Ruby 1.9 compat: rescue Exception since minitest's assertion doesn't …
…subclass StandardError
@jeremy jeremy Wrap straggling mocha user with uses_mocha block 76b54c5
Commits on Nov 18, 2008
@lukemelia lukemelia Prevent assert_template failures when a render :inline is called befo…
…re rendering a file-based template [#1383 state:resolved]

Signed-off-by: Joshua Peek <>
@dhh dhh Added config.i18n settings gatherer to config/environment, auto-loadi…
…ng of all locales in config/locales/*.rb,yml, and config/locales/en.yml as a sample locale [DHH]
@svenfuchs svenfuchs use :en as a default locale (in favor of :en-US)
Signed-off-by: David Heinemeier Hansson <>
@al2o3cr al2o3cr add vendor/ back to load paths; catch errors in constant loading
Signed-off-by: David Heinemeier Hansson <>
@gbuesing gbuesing Update bundled TZInfo to 0.3.12 98199eb
@gbuesing gbuesing TimeZone offset tests: use current_period, to ensure TimeZone#utc_off…
…set is up-to-date
@madrobby madrobby Update Prototype to and update to 1.8.2 9fb3c84
@NZKoz NZKoz Remove mention of long-dead define_javascript_functions 80e6aae
@NZKoz NZKoz Remove duplicate distribution of prototype and scriptaculous.
This was previously needed by define_javascript_functions which has been removed for a while.
@FooBarWidget FooBarWidget Register 'checked' as an HTML boolean attribute.
This way, 'tag :foo, :type => "checkbox", :checked => false' would output
the expected

  <input type="checkbox" />

instead of the old

  <input type="checkbox" checked="false" />

The latter would result in a checkbox that's initially checked.

Signed-off-by: Jeremy Kemper <>
@lukemelia lukemelia Fix rendering html partial via inline render when with :js format [#1399

Signed-off-by: Joshua Peek <>
@gtd gtd Make optimized named routes respect all reserved options and tie it i…
…nto UrlRewriter::RESERVED_OPTIONS so it's DRY

Signed-off-by: Michael Koziarski <>
Commits on Nov 19, 2008
@hiroshi hiroshi Let polymorphic_path treat an array contains single name as without a…
…rray [#1386 state:committed]

Signed-off-by: David Heinemeier Hansson <>
@dhh dhh The docs in environment.rb are not going to be rendered so it doesnt …
…make sense to mark them up
@dhh dhh Another piece of markup removed from environment.rb 49797f7
@dhh dhh Deprecated the :file default for ActionView#render to prepare for 2.3…
…'s new :partial default [DHH]
@lifo lifo Remove reset! as a connection#checkout callback 4f20a15
@metaskills metaskills Remove SQL Server cases from tests for latest adapter work to pass ra…
…ils expected behavior.

Signed-off-by: Michael Koziarski <>
@amatsuda amatsuda Require active_support/secure_random for Ruby 1.9.
[#1326 state:committed]

Signed-off-by: Jeremy Kemper <>
@jeremy jeremy Reflect default locale change from en-US to en dff4ab9
@aaronbatalion aaronbatalion Fixed asset host to not cache objects [#1419 state:resolved]
Signed-off-by: Joshua Peek <>
@aaronbatalion aaronbatalion need to make sure the asset type is cached with it in Cache.. name is…
… sufficient, not self

Signed-off-by: Jeremy Kemper <>
Commits on Nov 20, 2008
@dhh dhh alternative resolution to vendor load problem 24ead54
@dhh dhh Next release will be 2.2.2, might as well prepare for that 56220ab
@dhh dhh Cleaned up deprecation notices 8be7d96
@dasch dasch Ensure only delegations to methods can have an automatic prefix. [#1235
… state:resolved]

Signed-off-by: Pratik Naik <>
@dhh dhh Added back special case for ApplicationController 5e55ed1
@dhh dhh Merge branch '2-2-stable' of into 2-2-stable 3639c0b
Colin Curtin ActionMailer should respect content type when choosing layouts
Signed-off-by: Pratik Naik <>
Commits on Nov 21, 2008
@dhh dhh Reduced the number of literal aliases to the range that has actually …
…seen personal use. With the massive savings in overhead, I was able to fit Array#fourty_two
@dhh dhh Its forty, not fourty, dummy ca29de5
@dhh dhh Prepped for release 4adf56b
@dhh dhh Doc updates ff56137
Commits on Nov 23, 2008
@tomlea tomlea Changed the fallback String#each_char to use valid 1.9 syntax.
Signed-off-by: Jeremy Kemper <>
@josh josh A back support for legacy TemplateHandler#render API 24fea80
@yaroslav yaroslav Add i18n for number_to_human_size() helper storage units. Translation…
… key is number.human.storage_units.

[#1448 state:committed]

Signed-off-by: Jeremy Kemper <>
@jeremy jeremy Changelog for #1448. Mention updating old translations with storage_u…
…nits key.
Commits on Nov 24, 2008
@geoffgarside geoffgarside Reorder the way in which map.resource routes are added to the set. Th…
…is prevents the singular named route from hitting :create instead of :show.

Signed-off-by: Michael Koziarski <>
@geoffgarside geoffgarside Test default singleton resource route to ensure it uses GET. This is …
…important if using map.root :resource instead of map.root :resources for some reason.

Signed-off-by: Michael Koziarski <>
Commits on Nov 30, 2008
@jeremy jeremy Extract named_helper module_eval so it's easier to override 8b10c3e
Commits on Dec 01, 2008
@al2o3cr al2o3cr handle missing dependecies in gem loading
Signed-off-by: Michael Koziarski <>
Commits on Dec 02, 2008
@miloops miloops Make new_record? an alias of new? in ActiveResource to fix problem wi…
…th route generation in forms.

Signed-off-by: Michael Koziarski <>
Commits on Dec 03, 2008
@josh josh ActionView::Base.register_template_extension doesn't exist either 5919b62
Commits on Dec 08, 2008
Ben Symonds Change field_changed? method to handle the case where a nullable inte…
…ger column is changed from 0 to '0'

[#1530 state:committed]

Signed-off-by: Jeremy Kemper <>
Commits on Dec 09, 2008
Jason Cheow Add ActiveSupport::Multibyte::Chars#ord method so that it returns cor…
…rect Unicode value instead of falling back on String#ord in CoreExtensions, which is not multibyte compatible

[#1483 state:committed]

Signed-off-by: Jeremy Kemper <>
Commits on Dec 10, 2008
@miloops miloops Fix: counter_cache should decrement on deleting associated records.
[#1195 state:committed]

Signed-off-by: Jeremy Kemper <>
@miloops miloops Fix test names collision.
[#1549 state:committed]

Signed-off-by: Jeremy Kemper <>
@jeremy jeremy Revert "Fix: counter_cache should decrement on deleting associated re…

[#1196 state:open]

This reverts commit c9e176d.
@fcheung fcheung Squash memory leak when calling flush with an empty buffer
[#1552 state:committed]

Signed-off-by: Jeremy Kemper <>
Commits on Dec 15, 2008
@fcheung fcheung Fixed session related memory leak [#1558 state:resolved]
Signed-off-by: Joshua Peek <>
@fcheung fcheung Make constantize look into ancestors
[#410 state:resolved]

Signed-off-by: Jeremy Kemper <>
@jeremy jeremy Fix Array#forty_two test case spelling 75f5596
Commits on Dec 16, 2008
@jeremy jeremy Revert "Make constantize look into ancestors"
[#410 state:open]

This reverts commit 87790e0.
Commits on Jan 01, 2009
@dhh dhh Fixed the AssetTagHelper cache to use the computed asset host as part…
… of the cache key instead of just assuming the its a string [#1299 state:fixed]
Commits on Jan 02, 2009
@dhh dhh Make sure #compute_public_path caching allows to return different res…

for different given sources [#1471 state:resolved]
Commits on Jan 04, 2009
@gbuesing gbuesing TimeWithZone#- gives correct result with wrapped DateTime, and with D…
…ateTime argument
Commits on Jan 05, 2009
@josh josh Revert to the good old days when AssetTag didn't cause anyone problems e14909d
@josh josh Cache AssetTag timestamps 255c656
Commits on Jan 07, 2009
@ffmike ffmike Update CI config to reflect current gem requirements. 8101675
@NZKoz NZKoz Remove errant debugger statement 4b858a5
@NZKoz NZKoz Explicitly require action_view to bring in its i18n load path b3ece62
@NZKoz NZKoz Don't expand_path the tests in 2-2-stable as the target code doesn't. e7e34a4
@NZKoz NZKoz Spam people with commit rights on test failures. b009109
Commits on Jan 11, 2009
Nicholas Dainty TimeWithZone#xmlschema accepts optional fraction_digits argument [#1725
… state:resolved]
Commits on Jan 15, 2009
Carlos Kozuszko Fixing bug on ActiveRecord::Dirty#field_changed? for nullable numeric…
… columns, NULL gets stored in database for blank (i.e. '') values. Only integer columns were considered.

Signed-off-by: Michael Koziarski <>
[#1692 state:committed]
Commits on Jan 17, 2009
lukeludwig Cache columns for has_and_belongs_to_many associations
This avoids repeatedly calling SHOW COLUMNS when the association is queried
[#1738 state:committed]
Commits on Jan 18, 2009
@NZKoz NZKoz Fix has_and_belongs_to_many_associations tests. #1738

Commits on Jan 21, 2009
@NZKoz NZKoz Rationalise the session options to one hash, prevents rack or integra…
…tion tests from seeing incorrect defaults
Commits on Jan 22, 2009
@NZKoz NZKoz Bring back relative_url_root but deprecate it 827efe1
Commits on Jan 26, 2009
@stepheneb stepheneb Adding AR tests for JDBC connections
New connections:

  jdbcmysql jdbcpostgresql jdbcsqlite3 jdbcderby jdbch2 jdbchsqldb jdbcpostgresql

To test you will need the native database installed (if one is required),
activerecord-jdbc-adapter and the specific activerecord-jdbc<database>-adapter
for the database you are testing.

Run the tests like this:

  jruby -S rake test_jdbcmysql

Signed-off-by: Michael Koziarski <>
[#1685 state:committed]
@dubek dubek Mysql#reconnect is set according to the 'reconnect' key in the connec…
…tion spec.

The 'reconenct' boolean option is read from the connection specification
and is used to set the reconnect attribute of Mysql.  The default is
false in order not to change existing application behaviour.

Also, reconnect is set AFTER real_connect is called, so its value sticks
(the mysql gem sets reconnect to false inside real_connect).

Signed-off-by: Michael Koziarski <>
[#1797 state:committed]
Commits on Jan 29, 2009
@NZKoz NZKoz Move to use pg instead of postgres on the CI server 0c4a126
Commits on Feb 05, 2009
@dguettler dguettler check for template with specified extension but without template hand…
…ler extension [#1798 state:resolved]

Signed-off-by: Joshua Peek <>
Commits on Feb 06, 2009
@NZKoz NZKoz Handle every error that can come out of the Iconv branch by rescuing …
…and returning nil

[#1195 state:committed]


@dhh dhh Fixed syntax error [#1894 state:committed] 3056059
Commits on Feb 10, 2009
@jeremy jeremy Add missing test for parsing a multivalued query string 96687ad
Commits on Feb 12, 2009
Joshua Sierles Allow memcache-client versions > 1.5.x to override bundled version
Signed-off-by: Joshua Peek <>
Commits on Feb 17, 2009
@amatsuda amatsuda Ruby 1.9 compat: fix JSON decoding to work properly with multibyte va…

[#1969 state:committed]

Signed-off-by: Jeremy Kemper <>
Commits on Feb 20, 2009
@brunetton brunetton Make atomic_write() puts the check_file in the cache dir, not in appl…

root [#1962 state:resolved]
Signed-off-by: Joshua Peek <>
Commits on Feb 21, 2009
@moro moro Ruby 1.9.1p0's URI.decode() bug fix
backport to fix Ruby 1.9.1p0 bug on [ruby-dev:38005].

Signed-off-by: Jeremy Kemper <>
@jeremy jeremy URI.unescape fix removes the old unescape method 99341a2
@moro moro fix test data, should specify encoding to use multibyte chars on Ruby…
… 1.9

Signed-off-by: Jeremy Kemper <>
@jeremy jeremy Broaden URI.unescape fix to all affected 1.9.x by checking for broken…
… behavior instead of specific patchlevel
@jeremy jeremy Update changelog for URI.unescape fix
[#2033 state:committed]
Commits on Feb 22, 2009
@pixeltrix pixeltrix Fix requirements regexp for path segments
Signed-off-by: Michael Koziarski <>
@pixeltrix pixeltrix Remove hardcoded number_of_capturesin ControllerSegment to allow rege…
…xp requirements with capturing parentheses
Commits on Feb 25, 2009
@oboxodo oboxodo Fixed bug that makes named_scopes _forgot_ current scope
Signed-off-by: rick <>
[#1960 #1677 state:resolved]
@technoweenie technoweenie Merge branch '2-2-stable' of into 2-2-stable 763effc
@samgranieri samgranieri Ruby 1.9 compat: silence a warning about regexp languages
[#2050 state:committed]

Signed-off-by: Jeremy Kemper <>
Commits on Mar 11, 2009
@jeremy jeremy Don't duplicate :order from scope and options, it makes mysql do extr…
…a work
Commits on Apr 01, 2009
@fcheung fcheung Don't use the transaction instance method so that people with has_one…
…/belongs_to :transaction aren't fubared

[#1551 state:committed]

Signed-off-by: Jeremy Kemper <>
Commits on Apr 20, 2009
@lifo lifo Ensure JoinAssociation uses aliased table name when multiple associat…
…ions have hash conditions on the same table
Commits on Aug 23, 2009
@NZKoz NZKoz Fix timing attack vulnerability in the Cookie Store
Use a constant-time comparison algorithm to compare the candidate HMAC with the calculated HMAC to prevent leaking information about the calculated HMAC
Commits on Aug 31, 2009
@NZKoz NZKoz Add verify and clean methods to ActiveSupport::Multibyte.
When accepting character input from outside of your application you can't
blindly trust that all strings are properly encoded. With these methods
you can check incoming strings and clean them up if necessary.

Signed-off-by: Michael Koziarski <>


@NZKoz NZKoz Clean tag attributes before passing through the escape_once logic.
Addresses CVE-2009-3009
Commits on Sep 04, 2009
@technoweenie technoweenie Prepare for Rails 2.2.3 release. 6363822
Commits on Sep 08, 2009
@jeremy jeremy Fix AS test breakage 7a48cd6
@jeremy jeremy Ruby 1.9: fix MessageVerifier#secure_compare 91f65b7
@NZKoz NZKoz Revert "Ruby 1.9: fix MessageVerifier#secure_compare"
This reverts commit 91f65b7.

MessageVerifier was never in 2.2
@NZKoz NZKoz 1.9 compatible secure_compare 26306f9
Commits on Sep 11, 2009
@bohford bohford Remove redundant checks for valid character regexp in ActiveSupport::…
…Multibyte#clean and #verify.

[#3181 state:committed]

Signed-off-by: Jeremy Kemper <>
Commits on Sep 12, 2009
@NZKoz NZKoz Dup the arguments to string compare so we can use force_encoding. 76e971e
Commits on Sep 13, 2009
@jeremy jeremy Use Encoding.default_external, not _internal 8d354bc
@jeremy jeremy Silence warning for Encoding.default_external= e9a5ef4
@jeremy jeremy Ruby 1.9 compat: no . in load path 63f9426
@jeremy jeremy Ruby 1.9: fix Time#beginning_of_day inaccuracy due to subtracting a F…
Commits on Nov 27, 2009
@gtd gtd Make sure strip_tags removes tags which start with a non-printable ch…

Signed-off-by: Michael Koziarski <>
Commits on Jan 17, 2011
@NZKoz NZKoz 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