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.
This comparison is big! We're only showing the most recent 250 commits
Commits on Aug 05, 2009
@svenfuchs svenfuchs Make app template git adapter sync back output immediately by using s…
…ystem() instead of backticks [#2047 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
5a0e295
@technoweenie technoweenie move the serialized AR record logic to #as_json. Leave ActiveRecord::…
…Base#to_json to use the same Object#to_json implementation, but keep it around for documentation purposes.
55501b9
Commits on Aug 06, 2009
@amatsuda amatsuda Ruby 1.9.2 compat: Array#* uses to_str instead of to_s to join values…
… since Ruby 1.9.2

[#2959 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
8dab61d
@jeremy jeremy Merge branch '2-3-stable' of git@github.com:rails/rails into 2-3-stable 4b33155
Commits on Aug 07, 2009
@bschwartz bschwartz Ruby 1.9 compat: fix for SSL in Active Resource
[#1272 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
e1d27ee
Commits on Aug 08, 2009
@mrduncan mrduncan Default sent_on time to now in ActionMailer
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2607 state:committed]
f73d34c
@hardbap hardbap Add option to routes task to target a specific controller with CONTRO…
…LLER=x.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2928 state:committed]
1c6c216
@crankharder crankharder Tidy up the AR tests, removing duplicates and making tests clearer / …
…more focussed.

Signed-off-by: Michael Koziarski <michael@koziarski.com>

[#2774 state:committed]
9aaeb18
@miloops miloops Fix models load order to be able to run unit tests.
[#2550 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
6843fb9
@jeremy jeremy Fix caller in assert_redirected_to deprecation warning.
[#2932 state:committed]
ab6d295
@mwhuss mwhuss HTTP proxy support
[#2133 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
791c388
@NZKoz NZKoz Depend on rubygems 1.3.2
Also move the min_version definition up a line so it's present in the rescue block down below.
cd5e784
Commits on Aug 09, 2009
@stevestmartin stevestmartin Update truncate documentation / examples to more clearly demonstrate …
…its actual behavior

[#3016 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
679a0bf
Nick Quaranto and Josh Nichols Adding a deprecation warning for output.flush when rendering a proc o…
…r lambda

[#2893 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
d39c456
Jan Schwenzien Fix HTTP basic authentication for long credentials [#2572 state:resol…
…ved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
389449d
@mrduncan mrduncan Adding :from scoping to ActiveRecord calculations
Signed-off-by: Michael Koziarski <michael@koziarski.com>
407fbb5
@marcandre marcandre Enumerable#sum now works will all enumerables, even if they don't res…
…pond to :size

[#2489 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
819c347
@NZKoz NZKoz Don't call additional methods on builders passed to the atom_feed hel…
…per.

Additionally, actually test that the atom_feed helper works with :xml as an option.

[#1836 state:committed]
796b7c6
@hugopeixoto hugopeixoto MySQL: fix diacritic uniqueness test by setting the default character…
… set and collation to utf8/utf8_unicode_ci

[#2883 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ac9f9a9
@rob-at-thewebfellas rob-at-thewebfellas Fix binary fixture test on Windows
[#2597 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
a25296a
@tristandunn tristandunn Don't define a default primary key in the schema dumper.
[#1908 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9aa9bad
Rich Bradley Fix for nested :include with namespaced models.
[#260 state:committed]
0b95a2a
@wycats wycats Added benchmark to 2-3 7d40ba1
@wycats wycats Benchmarks 3cad1df
@wycats wycats Update bench harness in 2.3 to match master output ee8fe3a
@jeremy jeremy Setting connection timeout also affects Net::HTTP open_timeout.
[#2947 state:resolved]
83cc7de
@ratnikov ratnikov Changed to use klass instead of constantizing in assign_ids generated…
… method

[#260 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
32c2355
@josevalim josevalim Make http digest work with different server/browser combinations. [#3006
 status:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2d2216f
@siebertm siebertm Fix deprecating =-methods by using send [#2431 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
4c96030
@hugopeixoto hugopeixoto added tests for namespaced models generation and fixed a bug related …
…to it. Also fixed a pluralization=false issue.

Signed-off-by: José Valim <jose.valim@gmail.com>
5f6623b
@hugopeixoto hugopeixoto Fixed the end_of_* to work with Time.usec (and Time.nsec in ruby1.9) [#…
…1225 status:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
5e4b946
@hardbap hardbap Serialized attributes should only be saved with partial_updates when …
…the serialized attribute is present [#2397 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
8056c57
@rizwanreza rizwanreza Support passing Redcloth options via textilize helper [#2973 state:re…
…solved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
d1202cf
@railsbob railsbob Ensure hm:t#find does not assign nil to :include [#1845 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
80d8608
@wr0ngway wr0ngway Allow connect_timeout, read_timeout and write_timeout settings for My…
…SQL [#2544 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
d3a802c
@croaky croaky Deprecation warning for routes_for_controller_and_action. Use routes_…
…for instead. [#3023]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
8058a1d
@simonjefford simonjefford Add test for routes_for_controller_and_action deprecation [#3023]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
c41fb58
@jeremy jeremy Fix that RedCloth shouldn't be required to run tests d44b5c6
@hugopeixoto hugopeixoto Added a uniqueness validation test that uses diacritics.
[#2883 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
a8286af
Elise Huard validate uniqueness with limit in utf8
[#2653 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
f6f04f1
@rnicholson rnicholson Add ability to set SSL options on ARes connections.
[#2370 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
de0b073
Hugo Peixoto With multiparameter date attributes, the behaviour when empty fields …
…are present is now coherent with the one described in the date_select documentation.

[#1715 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2c4f4a8
David Burger Fix that Hash#to_xml and Array#to_xml shouldn't modify their options …
…hashes [#672 state:resolved] [David Burger, Dana Jones]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
c9d4bcf
@technicalpickles technicalpickles Added back support for destroying an association's object by id. [#2306
… status:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
29a5549
@rubymerchant rubymerchant Make ActiveResource#exists? work [#3020 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
323f58f
@nagybence nagybence path_names could be used to customize collection actions too
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
250e718
Hugo Peixoto Added both the documentation and a test case for the collection path …
…name customization feature.

[#1218 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
39de15f
@tristandunn tristandunn No longer require database name for MySQL to allow cross database sel…
…ects.

[#1122 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
7908cfa
@stiff stiff Make sure association conditions work with :include and :joins [#358
…state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
93f5d9d
Jordan Brough Active Resource recognizes 410 as Resource Gone now [#2316 state:reso…
…lved] [Jordan Brough, Jatinder Singh]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>

Conflicts:

	activeresource/lib/active_resource/exceptions.rb

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
be017fd
@GrzesF GrzesF Ensure ActiveResource#load works with numeric arrays [Grzegorz Forysi…
…nski, Elad Meidar]

[#2305 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
59c3b0d
@mrduncan mrduncan Fixed to_label_tag to accept id attribute without changing for attrib…
…ute [#2660 status:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
ba96125
@arthurgeek arthurgeek Model#human_attribute_name now accept symbols [#3025 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
18b4ac6
@arthurgeek arthurgeek Removed duplicated tests [#3026 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
9bcacf4
@gtd gtd Enable has_many :through for going through a has_one association on t…
…he join model [#2719 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
b763858
@tristandunn tristandunn Prevent overwriting of table name in merging SQL conditions [#2949 st…
…ate:resolved]
491f1b5
@visnup visnup Allow ho:through#build when the owner is a new record [#1749 state:re…
…solved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
ecc9b70
Commits on Aug 10, 2009
@maxlapshin maxlapshin Make sure link_to generates the form with the specified :href if any [#…
…2254 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
9e29c08
@jeem jeem make private_and_public_methods unmemoizable [#2372 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
cc3183d
@croaky croaky has_many :through create should not raise validation errors
[#2934 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
33c054d
@technicalpickles technicalpickles Backported XML serialization behavior from master for dealing with ro…
…ot nodes that have modules.

ie,
- the root node is dasherized, such that MyApplication::Business::Project becomes <my-application-project-business-project>
- association children nodes have type attributes, such that MyApplication::Business::Developer becomes <developer type="MyApplication::Project::Developer">

[#2723 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
15fd67e
@technicalpickles technicalpickles Only load db/schema.rb if it exists; otherwise, display a message to …
…run db:migrate or remove active_record in environment.rb.

[#3012 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ebb6606
@josh josh Deprecate router generation "best match" sorting ff643ce
@rubymerchant rubymerchant AR should respect default values for MySQL BINARY and VARBINARY columns.
[#1273 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
8a49af3
@gtd gtd Fix that counter_cache breaks with has_many :dependent => :nullify.
[#1196 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9bc80f4
@jeremy jeremy Fix test dependency on taggings 011baa0
Morgan Schweers Fix that creating a table whose primary key prefix type is :table_nam…
…e generates an incorrectly pluralized primary key.

[#872 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
d0bdff0
@josevalim josevalim Allow radio buttons to work with booleans.
[#2937 state:committed]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
e972acc
@bellmyer bellmyer raises exception (ActiveRecord::ConfigurationError with message) on h…
…abtm association creation if join table contains a primary key

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9a3a798
@bellmyer bellmyer raises an exception on habtm join table inserts if join table contain…
…s a primary key. Caches this check to save time on subsequent inserts.

[#2086 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9d51f62
@leonardoborges leonardoborges PostgreSQL: XML datatype support
[#1874 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
5c74cff
Daniel Sheppard Fix that JSON parser fails to read escaped backslashes.
[#973 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9341655
@jakimowicz jakimowicz Add support for errors in JSON format.
[#1956 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
c3da22c
Tim Peters Use table prefix and suffix for schema_migrations index.
[#1543 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9e96f37
@cristibalan cristibalan Add tests for scoping schema_migrations index by global table prefix …
…and suffix

[#1543 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
25fe43b
@eostrom eostrom Correctly handle offsets in Multibyte::Chars#index and #rindex.
The offset in codepoints was being passed directly to the wrapped string's index/rindex method. Now we translate the offset into bytes first.

[#3028 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
4e01437
codeape Introduce grouped_collection_select helper.
[#1249 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9a42096
@kamal kamal find_cmd should return the full path of the db command
[#1488 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9284bcc
@FooBarWidget FooBarWidget Correctly unlock the reloader lock if the underlying app raises an ex…
…ception.

[#2873 state:incomplete]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
a919698
@brynary brynary Allow delegating to nil, because the method might actually exist on it e82b435
Commits on Aug 11, 2009
@jeremy jeremy 'would of' => 'will be' 6f5d1f3
Commits on Aug 15, 2009
Jay Pignata Fix test_has_many_through_polymorphic_has_one on sqlite2 [#3054 state…
…:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
dad0f62
Jay Pignata Fix calculation tests on sqlite2 [#3053 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
a249cad
@rubymerchant rubymerchant Fix ActiveResource load test for 64bit machines [#3051 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
dbc62ad
@jeremy jeremy Refine the deprecated route check to explicitly check whether the fut…
…ure route pick comes before the deprecated route that was found.
061b0ba
@jeremy jeremy Normalize route generation order: associations, yield block, then own…
… routes.
75a483e
Jay Pignata Adding a call to logger from params_parser to give detailed debug inf…
…ormation when invalid xml or json is posted

[#2481 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
1cf32ad
Commits on Aug 16, 2009
@FooBarWidget FooBarWidget Fix reloading of metal pieces.
- Do not hold references to old metal objects after metal classes have been reloaded.
- Obtain the reloader lock before building the middleware stack, so that reloading of metal pieces works in the face of multithreading.

[#2873 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
14b6ab0
@jeremy jeremy Bump pg gem requirement to 0.8.0. Build psql db with UTF8 encoding. 1cb433c
@jeremy jeremy 2-3-stable CI notifies rails core list d8ae3d5
Commits on Aug 17, 2009
@lifo lifo Deprecate SQLite2Adapter and DeprecatedSQLiteAdapter b9f668e
Commits on Aug 18, 2009
@dhh dhh Added db/seeds.rb as a default file for storing seed data for the dat…
…abase. Can be loaded with rake db:seed (or created alongside the db with db:setup). (This is also known as the "Stop Putting Gawd Damn Seed Data In Your Migrations" feature) [DHH]

Conflicts:

	railties/CHANGELOG
f3c7bbe
@wycats wycats Removes examples so it can be replaced with separate repo 5f6e788
Commits on Aug 20, 2009
@ffmike ffmike Fix trivial typo in template runner example [#3082 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
9127c5b
Commits on Aug 24, 2009
@jeremy jeremy Add active_support/all for forward compatibility. d6a944f
Commits on Aug 25, 2009
@jeremy jeremy Benchmark script via miloops' arel fork via DataMapper's AR compariso…
…n script
f1355e6
@miloops miloops timestamps gives a created_at field not created_on.
[#3093 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
38d6e65
@jeremy jeremy Fix typo e213f0c
Commits on Aug 26, 2009
@amatsuda amatsuda I18n: use I18n for select helpers' prompt text
[#2252 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
d725ad3
@svenfuchs svenfuchs allow ActiveRecord#RecordInvalid exception message to be localized
[#2754 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
a4838ee
@jeremy jeremy Revert "I18n: use I18n for select helpers' prompt text"
Broke CI.

[#2252 state:open]

This reverts commit d725ad3.
3cd245b
@amatsuda amatsuda I18n: use I18n for select helpers' prompt text
[#2252 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
e46e67c
@packagethief packagethief UrlRewriter#rewrite_url should call #to_param on the value given in :…
…anchor option, just as #url_for does

[#2746 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
4240890
@packagethief packagethief Don't use AR::Base.connection for fixture column quoting. Use the con…
…nection given to Fixtures.new

[#3104 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
8a49183
Commits on Aug 27, 2009
@packagethief packagethief When running multiple test tasks, don't abort early if one produces f…
…ailures

[#3107 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
058459d
Commits on Aug 28, 2009
@jeremy jeremy Prefer utf8_unicode_ci (better) over utf8_general_ci (faster) 05d7409
Commits on Aug 29, 2009
Sven Fuchs + Mateo Murphy Fix ActiveRecord Error message I18n:
* allow messages and full_messages to be lazily translated at any time
* allow locales to be swapped and still obtain correctly localized messages
* allow localized global and error-type specific full_message formats
* extract an Error class

[#1687 state:open]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
13fb26b
Commits on Aug 30, 2009
@thewoolleyman thewoolleyman CI config updates: do not send CI emails unless explicitly enabled, u…
…se 'gem update --system', and send emails from an address which can post to the core list

[#3116 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
70ed47f
Jay Pignata Ensuring that a singular model name is set for use in controllers whe…
…n scaffold is passed a plural model name

[#3062 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ff8cb50
@atd atd I18n support for plugins
Rails will now automatically add locale files found in any engine's locale
directory to the I18n.load_path (i.e. files that match the glob pattern
"config/locales/**/*.{rb,yml}" relative to engine directories).

[#2325 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
49342d1
Commits on Aug 31, 2009
Jay Pignata Duplicating the options hash in Date#advance to prevent modification …
…of the original [#1133 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
49c4a79
@josh josh Deprecated "best fit" detection is to difficult. Just provide a switc…
…h to toggle the new behavor on.

  # new_rails_defaults.rb
  ActionController::Routing.generate_best_match = false
6fdfe4c
Commits on Sep 01, 2009
@gbuesing gbuesing Rails::Info doesn't require version for unwanted frameworks
[#3124 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
6bf1777
@josevalim josevalim Assert primary key does not exist in habtm when the association is de…
…fined, instead of doing that everytime a record is inserted.

[#3128 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
594a281
Commits on Sep 02, 2009
@jeremy jeremy Revert "Assert primary key does not exist in habtm when the associati…
…on is defined, instead of doing that everytime a record is inserted."

Test failures on PostgreSQL.

[#3128]

This reverts commit 594a281.
2b82708
Commits on Sep 03, 2009
@codahale codahale Fix timing attack vulnerability in ActiveSupport::MessageVerifier.
Use a constant-time comparison algorithm to compare the candidate HMAC with the calculated HMAC to prevent leaking information about the calculated HMAC.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
1f07a89
@Manfred Manfred 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>
07c6938
@NZKoz NZKoz Clean tag attributes before passing through the escape_once logic.
Addresses CVE-2009-3009
9a68c72
@NZKoz NZKoz Prepare for 2.3.4 release a43ef24
Commits on Sep 08, 2009
@jeremy jeremy Ruby 1.9: fix MessageVerifier#secure_compare 8a2cfe9
@josevalim josevalim Allow scope to be changed for ActiveRecord::Errors#generate_full_mess…
…age and change deprecation message [#1687 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
e1b1096
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 <jeremy@bitsweat.net>
a32eeeb
@ntalbott ntalbott Fix filtering parameters when there are Fixnum or other un-dupable va…
…lues.

[#3184 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ab9efe9
@shugo shugo Removed the copyright notice not to show it in the result of 'ri Acti…
…veRecord'.
d2cf33e
Commits on Sep 12, 2009
@qoobaa qoobaa ruby 1.9 friendly secure_compare
Signed-off-by: Michael Koziarski <michael@koziarski.com>
5de7539
@amatsuda amatsuda 1.9 compat: let -g option work with Ruby 1.9
[#3105 state:committed milestone:2.3.5]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
028d449
@amatsuda amatsuda 1.9 compat: let -c option work with Ruby 1.9
[#3109 state:committed milestone:2.3.5]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
3413643
@amatsuda amatsuda Fix default_error_messages back to the original message
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
596406f
@amatsuda amatsuda Ensure validation errors to be ordered in declared order
[#2301 state:committed milestone:2.3.5]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
44fbc86
@amatsuda amatsuda Ruby 1.9 compat: Avoid using the return value of FileUtils.mkdir_p, a…
…s it does not return a String but an Array in Ruby 1.9

[#2018 state:committed milestone:2.3.5]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
c5e3309
@jeremy jeremy Deprecate "Allow frameworks to be required by their gem name"
This has just been confusing. Better to educate than band-aid.

This deprecates commit 18a2427.
Originally from http://dev.rubyonrails.org/ticket/8845 [drnic]
08d15f8
@jeremy jeremy activesupport -> active_support 3f59a73
@sdsykes sdsykes Fix habtm associations when using multiple databases
[#3128]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
d48d3d0
@hardbap hardbap Raise an exception with friendlier error message when attempting to b…
…uild a polymorphic belongs_to with accepts_nested_attributes_for. [#2318 state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
52a50db
@cainlevy cainlevy Don't cascade autosave validation to destroyed children. [#2761 state…
…:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
7c1e4ef
@Odaeus Odaeus Allow fields_for on a nested_attributes association to accept an expl…
…icit collection to be used. [#2648 state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
55bc0c7
@alloy alloy Explicitely setting `autosave => false' should override new_record au…
…tosaving. [#2214 state:resolved]

Original author is Jacob.
2420d62
Dmitry Polushkin Fix autosave association to skip validation if it is marked for destr…
…uction. [#2064 state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
c52a50e
@josevalim josevalim Rename nested attributes _delete to _destroy to reflect its actual be…
…havior and DSL (:allow_destroy). Deprecation warning added. [#2889 state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
11c3387
@gbp gbp Fix has_one with foreign_key and primary_key association bug which ca…
…used the associated object being lost when saving the owner. [#1756 state:resolved]

Mixed in a bit from patch by ransom-briggs. [#2813 state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
a070873
@alloy alloy During autosave, ignore records that already have been destroyed. [#2537
 state:resolved]
c665faa
@alloy alloy Added some documentation about setting :autosave => false on an assoc…
…iation.
9290051
@kovyrin kovyrin Define autosave association validation methods only when needed. [#3161
… state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
c024549
@alloy alloy Removed some superfluous conditionals from the autosave association v…
…alidation methods.

Which are unneeded now that we only define them when needed.
2524ac8
@NZKoz NZKoz Dup the arguments to string compare so we can use force_encoding.
Conflicts:

	activesupport/lib/active_support/message_verifier.rb
6ddb7de
Commits on Sep 13, 2009
@sdsykes sdsykes Ruby 1.9 compat: corrected instance_methods check
[#3156 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
8afeec2
@jeremy jeremy Use Encoding.default_external, not _internal 477dfa4
@jeremy jeremy Silence warning for Encoding.default_external= 8dca666
@jeremy jeremy Ruby 1.9: fix Time#beginning_of_day inaccuracy due to subtracting a F…
…loat
c6fe042
@jeremy jeremy Ruby 1.9 compat: fix regexp slice test 09b197f
@jeremy jeremy Clean up spurious JSON decoding test failure abd7bd3
@jeremy jeremy Extract repetitive method f503a48
@jeremy jeremy Fix failing dependencies test relying on . being in LOAD_PATH ff0377d
Commits on Sep 17, 2009
Developer Allow Nokogiri XmlMini backend to process cdata elements
[#3219 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
179b451
@m4dc4p m4dc4p Enable use of MySQL stored procedures by default.
[#3204 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
4f5cac5
@jeremy jeremy Fix brittle content-type check. [#1956 state:committed] 1488c6c
@tenderlove tenderlove making nokogiri to hash less clever, more fast O_o
[#2243 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
e187528
Commits on Sep 21, 2009
Michael Gunderloy Fix variable error in Nokogiri XmlMini code [#3242 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
6222ac1
Commits on Sep 25, 2009
@Manfred Manfred Prefix Internet Explorer's accepted mime types with sensible defaults. c680f23
@alloy alloy Rewrote ActionView::TestCase.
The test case now mimicks the template environment more closely, so it's
possible to use render, load helper dependencies.

This also fixes assert_select, and similar assertions. Because view tests
and helpers generally don't render full templates assert_select looks
first in rendered and then in output_buffer to find the rendered output.
cddd474
@alloy alloy Made assert_dom_equal and assert_dom_not_equal ignore meaningless whi…
…tespace.

Also changed message of assert_dom_equal to be like assert_equal.
deac481
@alloy alloy The DomAssertions now also strip surrounding whitespace inside tags. b18248f
Commits on Sep 26, 2009
@thewoolleyman thewoolleyman include nokogiri gem, so activesupport nokogiri tests run
Signed-off-by: Joshua Peek <josh@joshpeek.com>
4a11ca1
Commits on Sep 28, 2009
@gaspard gaspard Fixes a bug where layouts provided with an absolute path would not be…
… found because they were prefixed by 'layouts'. This bug only appears if the path does not contain the word 'layouts'.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#3207 state:committed]
8371d6f
Luciano G Panaro Make has_one with :conditions hash scope build or creation of the ass…
…ociated object with those conditions

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#3088 state:committed]
14a6794
Jay Pignata Enhancing distance_of_time_in_words to prefix year output with over a…
…nd about depending upon how many months have elapsed

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#3106 state:committed]
b372b4c
@jtrupiano jtrupiano Introduce :almost keyword for distance_of_time_in_words. Make 1.75 da…
…ys - 2 days return '2 days'.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#3266 state:committed]
f489b33
@wycats wycats Merge branch '2-3-stable' of git@github.com:rails/rails into 2-3-stable 26f22a2
@thewoolleyman thewoolleyman make mysql and postgresql rebuild databases on every CI build, to pre…
…vent breakages such as collation and character set changing

Signed-off-by: Yehuda Katz <wycats@gmail.com>
f95a7f8
Commits on Sep 29, 2009
@thewoolleyman thewoolleyman reduce max size of fixture IDs to fix sqlite2 tests, because sqlite2 …
…was getting negative and changing values for ID field. See http://www.sqlite.org/datatypes.html

Signed-off-by: Yehuda Katz <wycats@gmail.com>
1901747
Commits on Sep 30, 2009
@brynary brynary Reduce specificity of logging test to avoid dependency on the system …
…clock

Signed-off-by: Yehuda Katz <wycats@gmail.com>
1d7412b
Commits on Oct 05, 2009
@josh josh Coerce all out going body parts to Strings 11cce5b
@packagethief packagethief MessageVerifier#verify raises InvalidSignature if the signature is blank
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
f98302e
Commits on Oct 06, 2009
@lifo lifo Monkey patch Rack::Lint to allow string subclass body 91b61a8
Jesse Proudman Running rake dev leaves ERB in environment.rb. The existing Rake task…
… was just copying the file across. This patch modifies the Rake task to use the same ERB processing string used on database.yml, which cleans up the environment.rb file.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
58f1443
Commits on Oct 07, 2009
@brynary brynary Only load rake tasks from tasks/**/*.rake and lib/tasks/**/*.rake in …
…plugins

Previously, it was **/tasks/**/*.rake, and that loaded some paths that shouldn't be like:

  * vendor/plugins/admin_assistant/test_rails_app/lib/tasks/rspec.rake
  * vendor/plugins/will_paginate/test/tasks.rake

Signed-off-by: Michael Koziarski <michael@koziarski.com>
0f14d7b
pivotal Explicitly require ActionController's CGI extensions so they're prope…
…rly loaded before the first request.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
6f2c499
@lifo lifo Allow accepts_nested_attributes_for :reject_if option accept symbols …
…for using a method
e212799
@lifo lifo Use indifferent access attributes instead of stringifying them a69316b
Commits on Oct 08, 2009
@NZKoz NZKoz Merge the prerequisites for on-by-default XSS escaping into rails.
This consists of:

* String#html_safe! a method to mark a string as 'safe'
* ActionView::SafeBuffer a string subclass which escapes anything unsafe which is concatenated to it
* Calls to String#html_safe! throughout the rails helpers
* a 'raw' helper which lets you concatenate trusted HTML from non-safety-aware sources (e.g. presantized strings in the DB)

Note, this does *not* give you on-by-default XSS escaping in 2.3 applications.  To get that you'll need to install a plugin:

http://github.com/nzkoz/rails_xss
80da8eb
@NZKoz NZKoz field_error_proc needs to return a safe string 95b7e4f
Commits on Oct 09, 2009
@lifo lifo Ensure MessageVerifier raises appropriate exception on tampered data 48b3060
@lifo lifo Mute log info coming from the local_cache strategy c47c5af
@lifo lifo Store entire options hash in the class var rather than just the rejec…
…t_if proc for the nested attributes

Conflicts:

	activerecord/lib/active_record/nested_attributes.rb
	activerecord/test/cases/nested_attributes_test.rb
4010b49
@lifo lifo Add a :limit option to specify the maximum number of records that can…
… be processed by accepts_nested_attributes_for

Conflicts:

	activerecord/lib/active_record/nested_attributes.rb
c23706b
Commits on Oct 10, 2009
@jeremy jeremy Mark html safety 7454d18
Commits on Oct 14, 2009
@packagethief packagethief CookieJar#delete should return the key's value, consistent with a Hash
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
bbaf3a0
@oggy oggy Make IntegrationTest::Runner propagate method_missing to ancestors.
Fixes RSpec integration example groups, which mixes its Matchers
module into ActiveSupport::TestCase.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
e10b0dd
Commits on Oct 15, 2009
@NZKoz NZKoz Backport the xss_safe? method for plugin authors targetting 2.3 and m…
…aster
459749c
Commits on Oct 17, 2009
@audiodude audiodude Ensure number_to_human_size does not strip zeros from the end [#1763
…state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
eb30c69
Commits on Oct 18, 2009
@ffmike ffmike Fix bad assumption in BacktraceCleaner test [#3249 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
9edfdef
Commits on Oct 21, 2009
@wycats wycats Fixed HTTP digest to properly return 401 when the Authorization heade…
…r has no nonce specified, or the Authorization header specifies Basic auth [#2968 state:resolved]
fdf356d
Commits on Oct 28, 2009
@josevalim josevalim Fix nested attributes error messages which is broken in 2.3.4. It sti…
…ll copies the message from child to parent, but does the lookup in the child, not in the parent, avoiding error messages duplication (as happened in 2.3.3). [#3147 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
f5f7c40
@josevalim josevalim Make polymorphic_url work with symbols again and refactor it [#1384 s…
…tatus:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
7ba8025
Commits on Nov 03, 2009
@matflores matflores Fix chars.reverse for multibyte decomposed strings
[#597 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
4ae03b2
Commits on Nov 05, 2009
@cch1 cch1 Fix OrderedHash#replace
Signed-off-by: Michael Koziarski <michael@koziarski.com>
c3ef028
Commits on Nov 06, 2009
@alloy alloy Define autosave association callbacks when using accepts_nested_attri…
…butes_for.

This way we don't define all the validation methods for all associations by
default, but only when needed.

[#3355 state:resolved]
6b2291f
@cch1 cch1 Make some assertions in the ActionView::TestCase tests actually do so…
…mething.

[#3468 state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
df9a47e
@cch1 cch1 Share ActionView::TestCase's output_buffer with view for concat support.
[#3467 state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
d36f8a2
Commits on Nov 09, 2009
@brynary brynary Fix some Ruby warnings: `*' interpreted as argument prefix 1a93e93
@brynary brynary Fix Ruby warning: instance variable @loaded not initialized 6fdd60e
@brynary brynary Fix Ruby warning: method redefined; discarding old breakpoint d988507
@jeremy jeremy Ruby 1.9 doesn't recognize EM SPACE as whitespace, breaking String#strip 9ea8500
@jeremy jeremy Work around Float faux precision d81c606
@jeremy jeremy Shush a3e129f
@jeremy jeremy Bump Rack to 1.0.1. Ensure integration test input is ASCII. fd0289f
@brynary brynary Silence warning: discarding old h 8820bb7
@brynary brynary Silence warning: method redefined; discarding old filename 2ccd4e7
@brynary brynary Silence warning: method redefined; discarding old template b68861a
@jeremy jeremy Merge commit 'brynary/2-3-stable' into 2-3-stable 97a7cdc
@jeremy jeremy Bump CI rack to 1.0.1 bfb931b
@brynary brynary Silence warning: instance variable @session not initialized a3ab2b0
@brynary brynary Silence warning: instance variable @controller not initialized 17fda24
@brynary brynary Silence warning: instance variable @real_format not initialized a0d28dc
@brynary brynary Silence warning: instance variable @explicit_view_paths not initialized 8073e47
@brynary brynary Silence warning: instance variable @auto_index not initialized ae5e2f5
@brynary brynary Silence warning: instance variable @integration_session not initialized ea345a5
@brynary brynary Silence warning: instance variable @segment not initialized 40f0ef7
@brynary brynary Silence warning: ambiguous first argument; put parentheses or even sp…
…aces
b45d44c
@brynary brynary Silence warning: instance variable @selected not initialized 22e1f4b
Commits on Nov 10, 2009
@al2o3cr al2o3cr delete correct records for a has_many with :primary_key and :dependen…
…t => :delete_all

Signed-off-by: Michael Koziarski <michael@koziarski.com>
6c0028d
@josevalim josevalim [PATCH] Optimize Error I18n to avoid unecessary lookups and just retr…
…ieve values when needed [#3477 status:resolved].

Signed-off-by: Joshua Peek <josh@joshpeek.com>
a454012
Commits on Nov 12, 2009
@dvrensk dvrensk Rdoc for changes introduced in 6339e5d, 542d6a0.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
4bc58a2
Commits on Nov 13, 2009
@jeremy jeremy Ruby 1.9.2: disallow explicit coercion via method_missing. Only give …
…friendly nil errors for Array and Active Record methods.
de03840
@jeremy jeremy Ruby 1.9.2: fix broken to_ary expectation 3a3dfe4
@jeremy jeremy test-unit 2: filter_backtrace is private f62a883
@jeremy jeremy Ruby 1.9.2: prefer Array.wrap to [foo].flatten 2d67ef9
@jeremy jeremy Ruby 1.9.2: StringIO no longer has #path 3fa8ca5
@jeremy jeremy Ruby 1.9.2: use super rather than raise our own NoMethodError to work…
… around to_ary issues
61bb491
@jeremy jeremy Test railties earlier rather than having to wait through AR 9abab5b
Commits on Nov 14, 2009
@jeremy jeremy Ruby 1.9: remove dep on T::U::AssertionFailedError c27cb5e
@jeremy jeremy Remove weird zombie test 90f3272
@jeremy jeremy CI: upgrade mysql, mocha, sqlite3-ruby 4ffe2e1
@jeremy jeremy Ruby 1.9: skip fcgi handler tests 4c3477c
@jeremy jeremy Typo 6950f0c
@jeremy jeremy CI: test AR + sqlite 2 on 1.8 only 78f5ecf
@jeremy jeremy Loosen i18n gem deps from ~> to >= 6da0365
Commits on Nov 15, 2009
@TildeWill TildeWill Allow explicit placement of hidden id element for nested models.
[#3259 state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
88d2e4c
Commits on Nov 17, 2009
@jeremy jeremy Revert "Ensure Model#destroy respects optimistic locking"
Unresolved issues with :dependent => :destroy and counter caching.

[#1966 state:open]

This reverts commit 0d92288.
ed320cd
Commits on Nov 18, 2009
@gtd gtd Insert generated association members in the same order they are speci…
…fied when assigning to a has_many :through using the generated *_ids method

[#3491 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
df0720b
@jeremy jeremy Extract form_authenticity_param instance method so it's overridable i…
…n subclasses
a942d66
Commits on Nov 19, 2009
@NZKoz NZKoz Handle a nil logger when generating Deprecation warnings 93085a7
Commits on Nov 22, 2009
@jeremy jeremy Rails 3: move core_ext/blank to core_ext/object/blank for forward com…
…patibility
0bc150c
Commits on Nov 23, 2009
@josh josh Revert "Prefix Internet Explorer's accepted mime types with sensible …
…defaults."

IE XHR requests are misinterpreted as HTML instead of JS.

This reverts commit c680f23.
0f0f977
@dhh dhh Fixed that the debugger wouldn't go into IRB mode because of left-ove…
…r ARGVs [DHH]
d796fc6
@dhh dhh Merge branch '2-3-stable' of github.com:rails/rails into 2-3-stable 27b935d
Commits on Nov 25, 2009
@NZKoz NZKoz Prepare for the 2.3.5 release ec542ca
@NZKoz NZKoz Remove strange .diff file c7057a2
Commits on Nov 26, 2009
@eac eac Decode http_authentication creditentials without generating abitrary …
…symbols.
3719bd3
@gtd gtd Make sure strip_tags removes tags which start with a non-printable ch…
…aracter

Signed-off-by: Michael Koziarski <michael@koziarski.com>
bfe0328