Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-05-19 | 127 | -872/+1359 | |
|\ | ||||||
| * | group :mri deleted in favor of RUBY_ENGINE and RUBY_VERSION usage. | Santiago Pastorino | 2010-05-19 | 1 | -8/+9 | |
| | | | | | | | | | | | | | | Allow use json, yajl-ruby and nokogiri on MRI and Rubinius only. jruby-debug added only for jruby platform Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Final iteration of use better testing methods | Neeraj Singh | 2010-05-19 | 25 | -82/+82 | |
| | | | | | | | | | | | | [#4652 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Fix xml serialization test [#4650 state:resolved] | Anil Wadghule | 2010-05-19 | 1 | -2/+5 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Enable ruby-debug only for MRI | Santiago Pastorino | 2010-05-19 | 1 | -2/+2 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Fixes a test on transaction_callbacks_test.rb | Santiago Pastorino | 2010-05-19 | 1 | -2/+2 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Avoid instance variable @output_buffer not initialized | Santiago Pastorino | 2010-05-19 | 1 | -1/+2 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Use better assertion methods for testing | Neeraj Singh | 2010-05-19 | 27 | -123/+116 | |
| | | | | | | | | | | | | [#4645 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | removes deprecations of last_(month|year) from master, they will be ↵ | Xavier Noria | 2010-05-19 | 5 | -39/+1 | |
| | | | | | | | | deprecated in 2.3 instead | |||||
| * | Revert "Don't carry default value when changing column for a binary type on ↵ | Jeremy Kemper | 2010-05-18 | 2 | -17/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL" Broke mysql tests. This reverts commit edec1afe25014749f0e2df86d27477b45586a9e3. Conflicts: activerecord/test/cases/migration_test.rb [#3234 state:open] | |||||
| * | make add_index and remove_index more resilient; new rename_index method; ↵ | Étienne Barrié | 2010-05-18 | 8 | -13/+147 | |
| | | | | | | | | | | | | | | | | track database limits [#3452 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Avoid creating a Rack::Response object in the cookie middleware since it may ↵ | José Valim | 2010-05-18 | 1 | -9/+13 | |
| | | | | | | | | stream the body. | |||||
| * | Fixes transaction callbacks tests | Santiago Pastorino | 2010-05-18 | 1 | -23/+19 | |
| | | | | | | | | | | | | [#4640 state:committed] Signed-off-by: wycats <wycats@gmail.com> | |||||
| * | Nested records (re: autosave) are now updated even when the intermediate ↵ | Ian White | 2010-05-18 | 4 | -2/+106 | |
| | | | | | | | | | | | | parent record is unchanged [#4242 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | assert_equal should be used instead of assert | Neeraj Singh | 2010-05-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | [#4629 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | expected value should come first in assert_equal | Neeraj Singh | 2010-05-18 | 1 | -3/+3 | |
| | | | | | | | | | | | | [#4630 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Use assert_equal correctly in actionmailer test (exposing one as broken) | Neeraj Singh | 2010-05-18 | 1 | -2/+3 | |
| | | | | | | | | | | | | [#4626 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Better error messages for some of ActiveSupport tests | Neeraj Singh | 2010-05-18 | 1 | -6/+6 | |
| | | | | | | | | | | | | [#4635 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | assert should be replaced with assert_equal in a particular test case | Neeraj Singh | 2010-05-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | [#4636 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Remove Model.clear_default_scope | Pratik Naik | 2010-05-18 | 2 | -16/+0 | |
| | | ||||||
| * | Cut the fat and make session stores rely on request.cookie_jar and change ↵ | José Valim | 2010-05-18 | 8 | -134/+72 | |
| | | | | | | | | set_session semantics to return the cookie value instead of a boolean. | |||||
| * | Fixed numericality validator in ActiveModel to reject hex numbers for floats ↵ | rohit | 2010-05-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | completely [#4622 state:commited] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Add a valid hex that shouldn't be valid to ActiveModel numericality tests ↵ | rohit | 2010-05-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | [#4622 state:commited] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Use assert_respond_to because it has better error messaging | Neeraj Singh | 2010-05-18 | 3 | -8/+8 | |
| | | | | | | | | | | | | [#4628 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Remove deprecated methods since 2-3-stable. | José Valim | 2010-05-18 | 2 | -46/+6 | |
| | | ||||||
| * | Kill legacy dispatcher. | José Valim | 2010-05-18 | 2 | -26/+0 | |
| | | ||||||
| * | Simplify cookie_store by simply relying on cookies.signed. | José Valim | 2010-05-18 | 9 | -151/+138 | |
| | | ||||||
| * | Rely on set and delete cookie logic from rack. | José Valim | 2010-05-18 | 2 | -33/+6 | |
| | | ||||||
| * | Renames Array#rand -> Array#random_element | Rizwan Reza | 2010-05-17 | 4 | -17/+5 | |
| | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | |||||
| * | Merge remote branch 'origin/master' | wycats | 2010-05-17 | 4 | -3/+38 | |
| |\ | ||||||
| | * | Added default currency values to NumberHelper and pass them to I18n.translate | Santiago Pastorino | 2010-05-17 | 2 | -2/+22 | |
| | | | | | | | | | | | | | | | | | | [#4604 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| | * | Allow root to be given in the resources scope without need to specify :on => ↵ | José Valim | 2010-05-17 | 2 | -1/+16 | |
| | | | | | | | | | | | | collection. | |||||
| * | | Merge branch 'encodings' | wycats | 2010-05-17 | 2 | -5/+9 | |
| |\ \ | ||||||
| | * | | Make sure encoding changes don't break 1.8 | wycats | 2010-05-17 | 2 | -5/+9 | |
| | | | | ||||||
| * | | | Revert "Moved encoding work in progress to a feature branch." | wycats | 2010-05-17 | 22 | -89/+488 | |
| | |/ | |/| | | | | | | | This reverts commit ade756fe42423033bae8e5aea8f58782f7a6c517. | |||||
| * | | Valid hex strings aren't valid float column values, to match the integer ↵ | Jeremy Kemper | 2010-05-17 | 2 | -4/+9 | |
| | | | | | | | | | | | | restriction. [#4622 state:resolved] | |||||
| * | | Use assert_equal correctly in transaction callback tests (exposing some of ↵ | Paco Guzman | 2010-05-17 | 1 | -17/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | them as broken) [#4612] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | Ruby 1.9: helper path may be a pathname, so convert to a string before ↵ | Jeremy Kemper | 2010-05-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | quoting for regexp | |||||
| * | | AR::Base#clone fixed to set dirty bits for cloned object | pleax | 2010-05-16 | 2 | -1/+57 | |
| | | | | | | | | | | | | | | | | | | [#2919 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | cache connection when quoting | Comron Sattari | 2010-05-16 | 1 | -5/+6 | |
| | | | | | | | | | | | | | | | | | | | | | [#3642 state:committed] Signed-off-by: Marius Nuennerich <marius@nuenneri.ch> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | | | in Ruby things in general happen at runtime, no need to specify that | Xavier Noria | 2010-05-19 | 1 | -2/+3 | |
| | | | ||||||
* | | | Updating the doc with the info that class_inheritable_accessor | Neeraj Singh | 2010-05-19 | 1 | -0/+2 | |
| | | | | | | | | | | | | copies properties to child at runtime | |||||
* | | | Testing guide: Replace removed word | Josiah Ivey | 2010-05-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | Testing guide: Grammar, punctuation, and emphasize that test/unit is only ↵ | Josiah Ivey | 2010-05-18 | 1 | -13/+13 | |
| | | | | | | | | | | | | the default | |||||
* | | | fix documentation typo | Marius Nuennerich | 2010-05-18 | 1 | -2/+2 | |
| | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | | | Guides: Fix numerous broken links | Josiah Ivey | 2010-05-16 | 6 | -9/+8 | |
| | | | ||||||
* | | | Merge branch 'master' of git://github.com/rails/rails | Rizwan Reza | 2010-05-17 | 125 | -475/+1357 | |
|\| | | ||||||
| * | | a cloned object no longer mimics changed flags from creator , plus a test ↵ | Federico Brubacher | 2010-05-16 | 3 | -4/+15 | |
| | | | | | | | | | | | | | | | | | | case [#4614 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | | Moved encoding work in progress to a feature branch. | Jeremy Kemper | 2010-05-16 | 22 | -488/+89 | |
| |/ | | | | | | | This reverts commits af0d1a88157942c6e6398dbf73891cff1e152405 and 64d109e3539ad600f58536d3ecabd2f87b67fd1c. | |||||
| * | Change on Array extension from rand => random_element [#4555 state:committed] | Santiago Pastorino | 2010-05-16 | 4 | -13/+27 | |
| | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> |