aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Dont require 'application' when running testsPratik Naik2008-11-181-2/+0
|
* Fix script/consolePratik Naik2008-11-181-2/+0
|
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-173-11/+17
|\
| * Fix default_scope to work in combination with named scopesTom Stuart2008-11-173-11/+17
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* | Explicitly require test/unit so tests autorunJeremy Kemper2008-11-171-0/+4
|/
* Fix compatibility with Ruby 1.8 that also has the Miniunit gem installed.Hongli Lai (Phusion)2008-11-171-3/+7
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Explicitly require AS::DurationJeremy Kemper2008-11-171-0/+2
|
* Change usage of defined? to check the rubygems constant existance by a ↵Carlos Paramio2008-11-171-1/+1
| | | | | | rescue block on boot.rb for Ruby 1.9 compatibility Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Use ActiveSupport::TestCase in generated test/test_helper.rbJeremy Kemper2008-11-171-1/+1
|
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-177-16/+11
|\
| * BACKWARDS INCOMPATIBLE: Renamed application.rb to application_controller.rb ↵David Heinemeier Hansson2008-11-177-16/+11
| | | | | | | | and removed all the special casing that was in place to support the former. You must do this rename in your own application when you upgrade to this version [DHH]
* | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-179-87/+181
|\|
| * Fixed RedCloth and BlueCloth shouldn't preload. Instead just assume that ↵David Heinemeier Hansson2008-11-172-81/+74
| | | | | | | | they're available if you want to use textilize and markdown and let autoload require them [DHH]
| * The inflector is meant to work on words not phrases -- dont confuse people ↵David Heinemeier Hansson2008-11-161-2/+0
| | | | | | | | with a phrase example
| * Ensure shared default_scoping stack is duped before assigning to thread localJoshua Peek2008-11-161-1/+1
| |
| * Add text/plain to the browser_generated_types array as webkit and gecko can ↵Michael Koziarski2008-11-161-2/+2
| | | | | | | | | | | | | | | | submit them. For more information see: http://pseudo-flaw.net/content/web-browsers/form-data-encoding-roundup/
| * Added default_scope to Base [#1381 state:committed] (Paweł Kondzior)Pratik Naik2008-11-164-1/+104
| |
| * Ensure @@already_loaded_fixtures is initialized before usePratik Naik2008-11-161-1/+1
| |
| * Revert "Added default_scope to Base [#1381 state:committed] (Paweł ↵David Heinemeier Hansson2008-11-164-76/+0
| | | | | | | | | | | | Kondzior)" -- won't gel with threads. This reverts commit ff594b2bc94ff2a942fe6ca05672387722dee686.
| * Added default_scope to Base [#1381 state:committed] (Paweł Kondzior)David Heinemeier Hansson2008-11-164-0/+76
| |
* | Lazy-require state machine internals when the module is includedJeremy Kemper2008-11-153-7/+8
| |
* | Use the Ruby load path for test_helper requires. Fix AM::TestCase.Jeremy Kemper2008-11-157-21/+12
| |
* | Require callbacks so AS::TestCase may be required in isolationJeremy Kemper2008-11-151-0/+2
|/
* Switch to AS::TestCase for assert_deprecatedJeremy Kemper2008-11-151-2/+2
|
* Add create_fixtures method for testsJeremy Kemper2008-11-151-0/+4
|
* Set up fixtures for AR testsJeremy Kemper2008-11-151-0/+8
|
* Appropriate test case subclasses to get assert_tag and assert_deprecatedJeremy Kemper2008-11-152-2/+2
|
* Merge branch 'master' into testingJeremy Kemper2008-11-15102-2753/+5179
|\
| * auto_link helper: add intelligent ending closing bracket handling. add new ↵Mislav Marohnić2008-11-152-56/+94
| | | | | | | | | | | | | | tests and reorder new ones for readability Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1353 state:committed]
| * refactor autolink helper. change tests to expect HTML-escaped URLsMislav Marohnić2008-11-152-39/+44
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Moved the * strings out of construct_finder_sql to a new default_select ↵Will Bryant2008-11-151-1/+9
| | | | | | | | | | | | | | method so it can be overridden by plugins cleanly Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1371 state:resolved]
| * fix assignment to has_one :through associations.Matt Jones2008-11-157-5/+67
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Wrong referenceDavid Heinemeier Hansson2008-11-151-1/+1
| |
| * Added lambda merging to OptionMerger (especially useful with named_scope and ↵David Heinemeier Hansson2008-11-152-1/+15
| | | | | | | | with_options) [#740 state:committed] (Paweł Kondzior)
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-11-150-0/+0
| |\
| | * Fixed that no body charset would be set when there are attachments present ↵David Heinemeier Hansson2008-11-153-1/+12
| | | | | | | | | | | | [#740 state:commited] (Paweł Kondzior)
| * | Added lambda merging to OptionMerger (especially useful with named_scope and ↵David Heinemeier Hansson2008-11-154-1/+17
| |/ | | | | | | with_options) [#740 state:commited] (Paweł Kondzior)
| * Missing changelogs for relative_url_root changesMichael Koziarski2008-11-141-0/+2
| |
| * Missing changelog for memcache-client changesMichael Koziarski2008-11-141-0/+2
| |
| * Missing changelog for CSRF changesMichael Koziarski2008-11-141-0/+6
| |
| * Missing changelog for :only/:except on map.resourcesMichael Koziarski2008-11-141-0/+2
| |
| * Update release notes from docrails.Pratik Naik2008-11-142-2/+17
| |
| * A few more dependency updatesDavid Heinemeier Hansson2008-11-144-4/+4
| |
| * Link to 2.2.1 gemsDavid Heinemeier Hansson2008-11-141-5/+5
| |
| * Merge docrails.Pratik Naik2008-11-1450-2524/+4399
| |
| * Rails now requires rubygems 1.3.1 of higher.Pratik Naik2008-11-141-1/+1
| |
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-11-142-19/+40
| |\
| | * Make inheritance of map.resources :only/:except options behave more predictablyTom Stuart2008-11-142-19/+40
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * | Prepare for RC2David Heinemeier Hansson2008-11-1412-18/+14
| |/
| * Make polymorphic_url compact given array [#1317 state:committed]hiroshi2008-11-143-1/+14
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 14:56:53 +0000