Commit Graph

8372 Commits

Author SHA1 Message Date
Sven Fuchs
12118963ac use :en as a default locale (in favor of :en-US)
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2008-11-18 14:23:53 +01:00
David Heinemeier Hansson
d9b92ee11b Added config.i18n settings gatherer to config/environment, auto-loading of all locales in config/locales/*.rb,yml, and config/locales/en.yml as a sample locale [DHH] 2008-11-18 14:23:13 +01:00
Luke Melia
75fb8dfb99 Prevent assert_template failures when a render :inline is called before rendering a file-based template [#1383 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-11-17 22:09:22 -06:00
Eugene Bolshakov
3c9beb3dab Add helper test generators [#1199 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-11-17 21:56:39 -06:00
Pratik Naik
d22fe41cf8 Fix a typo in test helper 2008-11-18 08:40:38 +05:30
Pratik Naik
3319fa6965 Dont require 'application' when running tests 2008-11-18 08:38:01 +05:30
Pratik Naik
8f71d6bcf6 Fix script/console 2008-11-18 08:28:26 +05:30
Jeremy Kemper
5c84151186 Merge branch 'master' of git@github.com:rails/rails 2008-11-17 15:28:17 -08:00
Jeremy Kemper
5a4789e86a Explicitly require test/unit so tests autorun 2008-11-17 15:18:01 -08:00
Tom Stuart
32cb2345a5 Fix default_scope to work in combination with named scopes
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2008-11-17 22:00:14 +01:00
Hongli Lai (Phusion)
3a33ee28e9 Fix compatibility with Ruby 1.8 that also has the Miniunit gem installed.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2008-11-17 12:38:47 -08:00
Jeremy Kemper
2ace3d9154 Explicitly require AS::Duration 2008-11-17 11:38:24 -08:00
Carlos Paramio
8412200f90 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>
2008-11-17 10:53:18 -08:00
Jeremy Kemper
e3fcf9b668 Use ActiveSupport::TestCase in generated test/test_helper.rb 2008-11-17 10:39:46 -08:00
Jeremy Kemper
435b088f5a Merge branch 'master' of git@github.com:rails/rails 2008-11-17 10:36:02 -08:00
David Heinemeier Hansson
fcce1f17ea BACKWARDS INCOMPATIBLE: Renamed application.rb to application_controller.rb 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] 2008-11-17 19:27:35 +01:00
Jeremy Kemper
6ff506ffbc Merge branch 'master' of git@github.com:rails/rails 2008-11-17 10:17:42 -08:00
David Heinemeier Hansson
4b33fae1f5 Fixed RedCloth and BlueCloth shouldn't preload. Instead just assume that they're available if you want to use textilize and markdown and let autoload require them [DHH] 2008-11-17 18:31:36 +01:00
David Heinemeier Hansson
54c1856425 The inflector is meant to work on words not phrases -- dont confuse people with a phrase example 2008-11-16 21:29:48 +01:00
Joshua Peek
e6c51051e4 Ensure shared default_scoping stack is duped before assigning to thread local 2008-11-16 13:52:21 -06:00
Michael Koziarski
8c197fb4ab Add text/plain to the browser_generated_types array as webkit and gecko can submit them.
For more information see:

http://pseudo-flaw.net/content/web-browsers/form-data-encoding-roundup/
2008-11-16 20:24:46 +01:00
Pratik Naik
2530d0eea8 Added default_scope to Base [#1381 state:committed] (Paweł Kondzior) 2008-11-16 23:36:41 +05:30
Pratik Naik
d9f460a39b Ensure @@already_loaded_fixtures is initialized before use 2008-11-16 22:21:05 +05:30
David Heinemeier Hansson
ca23287b44 Revert "Added default_scope to Base [#1381 state:committed] (Paweł Kondzior)" -- won't gel with threads.
This reverts commit ff594b2bc9.
2008-11-16 16:35:52 +01:00
David Heinemeier Hansson
ff594b2bc9 Added default_scope to Base [#1381 state:committed] (Paweł Kondzior) 2008-11-16 16:01:18 +01:00
Jeremy Kemper
29a31912fc Lazy-require state machine internals when the module is included 2008-11-15 21:05:03 -08:00
Jeremy Kemper
d7bad6e2eb Use the Ruby load path for test_helper requires. Fix AM::TestCase. 2008-11-15 20:25:14 -08:00
Jeremy Kemper
9e9dde617f Require callbacks so AS::TestCase may be required in isolation 2008-11-15 19:07:57 -08:00
Jeremy Kemper
c5448c75ab Switch to AS::TestCase for assert_deprecated 2008-11-15 13:28:46 -08:00
Jeremy Kemper
5fe543b629 Add create_fixtures method for tests 2008-11-15 12:31:54 -08:00
Jeremy Kemper
160b8a8344 Set up fixtures for AR tests 2008-11-15 12:30:02 -08:00
Jeremy Kemper
0cd9b149e2 Appropriate test case subclasses to get assert_tag and assert_deprecated 2008-11-15 12:26:37 -08:00
Jeremy Kemper
eeea1a26ec Merge branch 'master' into testing 2008-11-15 12:21:04 -08:00
Mislav Marohnić
4f984c9d0e auto_link helper: add intelligent ending closing bracket handling. add new tests and reorder new ones for readability
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1353 state:committed]
2008-11-15 18:30:17 +01:00
Mislav Marohnić
c6c5cd5541 refactor autolink helper. change tests to expect HTML-escaped URLs
Signed-off-by: Michael Koziarski <michael@koziarski.com>
2008-11-15 18:30:01 +01:00
Will Bryant
789a3f5b03 Moved the * strings out of construct_finder_sql to a new default_select method so it can be overridden by plugins cleanly
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1371 state:resolved]
2008-11-15 18:26:41 +01:00
Matt Jones
d3fd997109 fix assignment to has_one :through associations.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
2008-11-15 18:20:39 +01:00
David Heinemeier Hansson
31be959de7 Wrong reference 2008-11-15 16:49:20 +01:00
David Heinemeier Hansson
9eaa0a3449 Added lambda merging to OptionMerger (especially useful with named_scope and with_options) [#740 state:committed] (Paweł Kondzior) 2008-11-15 16:48:14 +01:00
David Heinemeier Hansson
8d8195dc24 Merge branch 'master' of git@github.com:rails/rails 2008-11-15 16:44:58 +01:00
David Heinemeier Hansson
e6b33a8337 Added lambda merging to OptionMerger (especially useful with named_scope and with_options) [#740 state:commited] (Paweł Kondzior) 2008-11-15 16:44:47 +01:00
David Heinemeier Hansson
f46780a0b4 Fixed that no body charset would be set when there are attachments present [#740 state:commited] (Paweł Kondzior) 2008-11-15 11:05:44 +01:00
Michael Koziarski
44c3b865ac Missing changelogs for relative_url_root changes v2.2.1 2008-11-14 16:11:07 +01:00
Michael Koziarski
065cc202ce Missing changelog for memcache-client changes 2008-11-14 16:11:07 +01:00
Michael Koziarski
e4a345c1dc Missing changelog for CSRF changes 2008-11-14 16:11:07 +01:00
Michael Koziarski
16ae82db1e Missing changelog for :only/:except on map.resources 2008-11-14 16:11:07 +01:00
Pratik Naik
ad679a43ec Update release notes from docrails. 2008-11-14 20:32:33 +05:30
David Heinemeier Hansson
3be853b59d A few more dependency updates 2008-11-14 14:08:26 +01:00
David Heinemeier Hansson
4d0e6752bf Link to 2.2.1 gems 2008-11-14 13:52:32 +01:00
Pratik Naik
c70b993a9e Merge docrails. 2008-11-14 17:47:21 +05:30