Skip to content
This repository
  • 120 commits
  • 306 files changed
  • 57 comments
  • 43 contributors
Nov 14, 2008
Pratik Rails now requires rubygems 1.3.1 of higher. f58b0b2
Michael Koziarski Merge branch 'master' into 2-2-stable 0b424da
Nov 15, 2008
Matt Jones fix assignment to has_one :through associations.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
a5609cd
Will Bryant 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 <michael@koziarski.com>
[#1371 state:resolved]
5140bbd
Nov 16, 2008
Michael Koziarski Add text/plain to the browser_generated_types array as webkit and gec…
…ko can submit them.

For more information see:

http://pseudo-flaw.net/content/web-browsers/form-data-encoding-roundup/
b401c28
David Heinemeier Hansson The inflector is meant to work on words not phrases -- dont confuse p…
…eople with a phrase example
3e79dbd
Nov 17, 2008
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@bitsweat.net>
9fab882
Jeremy Kemper Remove deprecated Gem.manage_gems 78e374d
Jeremy Kemper Prefer a feature check to a version check 6bfd0ac
Jeremy Kemper Explicitly require AS::Duration 3eb0d29
Jeremy Kemper Workaround lack of Mocha on 1.9 (hasn't been updated for minitest yet) 8789394
Jeremy Kemper Ruby 1.9 compat: CGI switched back to Tempfile b55fc0f
Jeremy Kemper Ruby 1.9 compat: rescue Exception since minitest's assertion doesn't …
…subclass StandardError
fa7151c
Jeremy Kemper Wrap straggling mocha user with uses_mocha block 76b54c5
Luke Melia 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 <josh@joshpeek.com>
f7a8e39
Nov 18, 2008
David Heinemeier Hansson 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]
42c9d37
Sven Fuchs use :en as a default locale (in favor of :en-US)
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
5d3a14a
Matt Jones add vendor/ back to load paths; catch errors in constant loading
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
453931c
Geoff Buesing Update bundled TZInfo to 0.3.12 98199eb
Geoff Buesing TimeZone offset tests: use current_period, to ensure TimeZone#utc_off…
…set is up-to-date
b88d394
Thomas Fuchs Update Prototype to 1.6.0.3 and update script.aculo.us to 1.8.2 9fb3c84
Michael Koziarski Remove mention of long-dead define_javascript_functions 80e6aae
Michael Koziarski Remove duplicate distribution of prototype and scriptaculous.
This was previously needed by define_javascript_functions which has been removed for a while.
7d3efe7
Hongli Lai 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 <jeremy@bitsweat.net>
0f89ed5
Luke Melia Fix rendering html partial via inline render when with :js format [#1399
state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
afc7fce
Gabe da Silveira 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 <michael@koziarski.com>
af57ccb
Nov 19, 2008
Hiroshi Saito Let polymorphic_path treat an array contains single name as without a…
…rray [#1386 state:committed]

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

Signed-off-by: Michael Koziarski <michael@koziarski.com>
7a9c48c
Akira Matsuda Require active_support/secure_random for Ruby 1.9.
[#1326 state:committed]

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

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
085ebf0
Nov 20, 2008
David Heinemeier Hansson alternative resolution to vendor load problem 24ead54
David Heinemeier Hansson Next release will be 2.2.2, might as well prepare for that 56220ab
David Heinemeier Hansson Cleaned up deprecation notices 8be7d96
David Heinemeier Hansson Added back special case for ApplicationController 5e55ed1
David Heinemeier Hansson Merge branch '2-2-stable' of git@github.com:rails/rails into 2-2-stable 3639c0b
Nov 21, 2008
Daniel Schierbeck Ensure only delegations to methods can have an automatic prefix. [#1235
… state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2f7c073
ActionMailer should respect content type when choosing layouts
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
5b72c9b
David Heinemeier Hansson 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
9d8cc60
David Heinemeier Hansson Its forty, not fourty, dummy ca29de5
David Heinemeier Hansson Prepped for release 4adf56b
David Heinemeier Hansson Doc updates ff56137
Nov 22, 2008
Tom Lea Changed the fallback String#each_char to use valid 1.9 syntax.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
b696f04
Nov 23, 2008
Joshua Peek A back support for legacy TemplateHandler#render API 24fea80
Yaroslav Markin 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@bitsweat.net>
68d2130
Jeremy Kemper Changelog for #1448. Mention updating old translations with storage_u…
…nits key.
41abbe4
Nov 24, 2008
Geoff Garside 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 <michael@koziarski.com>
43a06d0
Geoff Garside 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 <michael@koziarski.com>
b546886
Nov 29, 2008
Jeremy Kemper Extract named_helper module_eval so it's easier to override 8b10c3e
Dec 01, 2008
Matt Jones handle missing dependecies in gem loading
Signed-off-by: Michael Koziarski <michael@koziarski.com>
d6f4072
Dec 02, 2008
Emilio Tagua Make new_record? an alias of new? in ActiveResource to fix problem wi…
…th route generation in forms.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
701abb9
Joshua Peek ActionView::Base.register_template_extension doesn't exist either 5919b62
Dec 08, 2008
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 <jeremy@bitsweat.net>
fc037be
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 <jeremy@bitsweat.net>
0329021
Dec 10, 2008
Emilio Tagua Fix: counter_cache should decrement on deleting associated records.
[#1195 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
c9e176d
Emilio Tagua Fix test names collision.
[#1549 state:committed]

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

[#1196 state:open]

This reverts commit c9e176d.
8fcd9cf
Frederick Cheung Squash memory leak when calling flush with an empty buffer
[#1552 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
8da5c55
Dec 15, 2008
Frederick Cheung Fixed session related memory leak [#1558 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
bf0a8eb
Frederick Cheung Make constantize look into ancestors
[#410 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
87790e0
Jeremy Kemper Fix Array#forty_two test case spelling 75f5596
Jeremy Kemper Revert "Make constantize look into ancestors"
[#410 state:open]

This reverts commit 87790e0.
d7b7ff0
Jan 01, 2009
David Heinemeier Hansson 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]
ee701e0
Jan 02, 2009
David Heinemeier Hansson Make sure #compute_public_path caching allows to return different res…
…ults

for different given sources [#1471 state:resolved]
bc36b07
Jan 04, 2009
Geoff Buesing TimeWithZone#- gives correct result with wrapped DateTime, and with D…
…ateTime argument
3d87f0f
Jan 05, 2009
Joshua Peek Revert to the good old days when AssetTag didn't cause anyone problems e14909d
Joshua Peek Cache AssetTag timestamps 255c656
Jan 07, 2009
Mike Gunderloy Update CI config to reflect current gem requirements. 8101675
Michael Koziarski Remove errant debugger statement 4b858a5
Michael Koziarski Explicitly require action_view to bring in its i18n load path b3ece62
Michael Koziarski Don't expand_path the tests in 2-2-stable as the target code doesn't. e7e34a4
Michael Koziarski Spam people with commit rights on test failures. b009109
Jan 11, 2009
TimeWithZone#xmlschema accepts optional fraction_digits argument [#1725
… state:resolved]
5664f24
Jan 16, 2009
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 <michael@koziarski.com>
[#1692 state:committed]
9606bc8
Jan 17, 2009
Luke Ludwig Cache columns for has_and_belongs_to_many associations
This avoids repeatedly calling SHOW COLUMNS when the association is queried
[#1738 state:committed]
7c147e9
Jan 18, 2009
Michael Koziarski Fix has_and_belongs_to_many_associations tests. #1738
Conflicts:

	activerecord/test/cases/helper.rb
97bc170
Jan 21, 2009
Michael Koziarski Rationalise the session options to one hash, prevents rack or integra…
…tion tests from seeing incorrect defaults
b75e2f3
Jan 22, 2009
Michael Koziarski Bring back relative_url_root but deprecate it 827efe1
Jan 26, 2009
Stephen Bannasch 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 <michael@koziarski.com>
[#1685 state:committed]
b081059
Jan 27, 2009
Dov Murik 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 <michael@koziarski.com>
[#1797 state:committed]
e5c211c
Jan 29, 2009
Michael Koziarski Move to use pg instead of postgres on the CI server 0c4a126
Feb 05, 2009
Daniel check for template with specified extension but without template hand…
…ler extension [#1798 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
be4ecc2
Feb 06, 2009
Michael Koziarski Handle every error that can come out of the Iconv branch by rescuing …
…and returning nil

[#1195 state:committed]

Conflicts:

	activesupport/lib/active_support/inflector.rb
3c006d4
David Heinemeier Hansson Fixed syntax error [#1894 state:committed] 3056059
Feb 10, 2009
Jeremy Kemper Add missing test for parsing a multivalued query string 96687ad
Feb 12, 2009
Allow memcache-client versions > 1.5.x to override bundled version
Signed-off-by: Joshua Peek <josh@joshpeek.com>
b0792a3
Feb 17, 2009
Akira Matsuda Ruby 1.9 compat: fix JSON decoding to work properly with multibyte va…
…lues

[#1969 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
13bf5c5
Feb 19, 2009
Bruno Duyé Make atomic_write() puts the check_file in the cache dir, not in appl…
…ication

root [#1962 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
3d15e1a
Feb 20, 2009
MOROHASHI Kyosuke 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@bitsweat.net>
a8f32e1
Jeremy Kemper URI.unescape fix removes the old unescape method 99341a2
MOROHASHI Kyosuke fix test data, should specify encoding to use multibyte chars on Ruby…
… 1.9

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
faf7986
Jeremy Kemper Broaden URI.unescape fix to all affected 1.9.x by checking for broken…
… behavior instead of specific patchlevel
518389d
Jeremy Kemper Update changelog for URI.unescape fix
[#2033 state:committed]
0f93f8c
Feb 22, 2009
Andrew White Fix requirements regexp for path segments
Signed-off-by: Michael Koziarski <michael@koziarski.com>
ce41582
Andrew White Remove hardcoded number_of_capturesin ControllerSegment to allow rege…
…xp requirements with capturing parentheses
51eb04c
Feb 25, 2009
Diego Algorta Fixed bug that makes named_scopes _forgot_ current scope
Signed-off-by: rick <technoweenie@gmail.com>
[#1960 #1677 state:resolved]
a9aa18f
risk danger olson Merge branch '2-2-stable' of git@github.com:rails/rails into 2-2-stable 763effc
Sam Granieri Ruby 1.9 compat: silence a warning about regexp languages
[#2050 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
b6ad4bd
Mar 10, 2009
Jeremy Kemper Don't duplicate :order from scope and options, it makes mysql do extr…
…a work
5f95347
Apr 01, 2009
Frederick Cheung 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 <jeremy@bitsweat.net>
2dab082
Apr 20, 2009
Pratik Ensure JoinAssociation uses aliased table name when multiple associat…
…ions have hash conditions on the same table
3cb8925
Aug 23, 2009
Michael Koziarski 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
674f780
Aug 31, 2009
Michael Koziarski 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 <michael@koziarski.com>

Conflicts:

	activesupport/lib/active_support/multibyte/chars.rb
9c61eb3
Michael Koziarski Clean tag attributes before passing through the escape_once logic.
Addresses CVE-2009-3009
31678df
Sep 03, 2009
risk danger olson Prepare for Rails 2.2.3 release. 6363822
Sep 08, 2009
Jeremy Kemper Fix AS test breakage 7a48cd6
Jeremy Kemper Ruby 1.9: fix MessageVerifier#secure_compare 91f65b7
Sep 09, 2009
Michael Koziarski Revert "Ruby 1.9: fix MessageVerifier#secure_compare"
This reverts commit 91f65b7.

MessageVerifier was never in 2.2
896475c
Michael Koziarski 1.9 compatible secure_compare 26306f9
Sep 10, 2009
Beau Harrington Remove redundant checks for valid character regexp in ActiveSupport::…
…Multibyte#clean and #verify.

[#3181 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
095cf91
Sep 13, 2009
Michael Koziarski Dup the arguments to string compare so we can use force_encoding. 76e971e
Jeremy Kemper Use Encoding.default_external, not _internal 8d354bc
Jeremy Kemper Silence warning for Encoding.default_external= e9a5ef4
Jeremy Kemper Ruby 1.9 compat: no . in load path 63f9426
Jeremy Kemper Ruby 1.9: fix Time#beginning_of_day inaccuracy due to subtracting a F…
…loat
a60779f