Commit Graph

12736 Commits

Author SHA1 Message Date
Jeremy Kemper
f2dd3578c0 self.defaults => default 2010-01-27 17:35:51 -08:00
Jeremy Kemper
030ab357f9 Remove unbundle changelogs 2010-01-27 17:11:29 -08:00
Jeremy Kemper
8399a315f5 Merge remote branch 'mikel/master' 2010-01-27 17:09:55 -08:00
Mikel Lindsaar
a06a5a64ba Unvendor'd text-format, now requires text-format gem 2010-01-28 12:08:14 +11:00
Mikel Lindsaar
c1f308f8c6 Unvendor'd MemCache-Client. Now requires the MemCache Client gem as a dependency - Don't forget to gem bundle buys and girls 2010-01-28 11:56:47 +11:00
Mikel Lindsaar
f1fe71d754 Unvendor'd Builder. Now requires the Builder gem as a dependency 2010-01-28 11:51:37 +11:00
Mikel Lindsaar
9029efce41 Unbundling TZInfo 2010-01-28 11:46:54 +11:00
Mikel Lindsaar
32ce2bb37f Updated mail requirement to 2.1.2 2010-01-28 11:33:58 +11:00
Gregor Schmidt
7b8c6472ff Adding custom yaml (de-)serialization for OrderedHash
[#3608 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-01-27 15:29:06 -08:00
Mikel Lindsaar
b6b3db6734 Fixed bug on HTML only emails getting set to text/plain 2010-01-28 00:24:30 +11:00
Geoff Buesing
f3caa63bcb Update bundled TZInfo to v0.3.16 2010-01-26 20:22:29 -06:00
Geoff Buesing
1cda85d08a Georgetown TimeZone is now mapped to "America/Guyana" instead of "America/Argentina/San_Juan" [#1821 status:resolved] 2010-01-26 20:18:17 -06:00
Jeremy Kemper
aef76d1e71 Merge remote branch 'fxn/master' 2010-01-26 15:38:49 -08:00
Mikel Lindsaar
458b6a7fc9 Fixing mailer generators to use the right email address 2010-01-27 10:35:56 +11:00
Aaron Patterson
beda2d43d6 future proofing the sqlite3 adapter code
Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
2010-01-26 15:09:11 -08:00
Xavier Noria
3c6891593d removes now void extending.rb 2010-01-26 23:08:00 +01:00
Xavier Noria
c25ac0deee removes Object#extended_by 2010-01-26 23:03:58 +01:00
Xavier Noria
ccec730d7f removes unused method Object#extend_with_included_modules_from 2010-01-26 23:01:51 +01:00
Xavier Noria
7d312e54ba deletes no void files removal.rb and class_test.rb 2010-01-26 22:57:27 +01:00
Xavier Noria
44afd785c8 removes unused method Class#remove_class 2010-01-26 22:51:44 +01:00
Xavier Noria
5f981ff029 removes unused method Class#reachable? 2010-01-26 22:49:35 +01:00
Xavier Noria
f85f5dfc8f removes unused Class#descedents 2010-01-26 22:48:21 +01:00
Xavier Noria
245bfafe33 removes unused Object#subclasses_of 2010-01-26 22:46:47 +01:00
Xavier Noria
5b01c8bb8b removes unused Object#remove_subclasses_of 2010-01-26 22:44:32 +01:00
Xavier Noria
1b2ac25a2f removes unused Class#remove_subclasses 2010-01-26 22:42:56 +01:00
Xavier Noria
ec7c642f5f removes unused method Class#subclasses 2010-01-26 22:37:55 +01:00
José Valim
6404feee50 AC railtie should configure helpers path. 2010-01-26 21:05:50 +01:00
José Valim
dc57d545bb Fix t('.helper'). 2010-01-26 20:43:35 +01:00
José Valim
9f63c4b26e Bring AM tests back to green again. 2010-01-26 19:50:59 +01:00
José Valim
af43674c1c Fix failing tests on AM about render(:body => Hash). 2010-01-26 19:15:32 +01:00
José Valim
bdc39fad36 Merge branch 'master' of git://github.com/rails/rails 2010-01-26 18:39:53 +01:00
Joshua Peek
31b538df64 Failing AM test for legacy multipart alternative rendering 2010-01-26 09:37:20 -06:00
José Valim
e274eb1df1 Bring layouts with proc back alive. 2010-01-26 16:34:25 +01:00
Joshua Peek
9f7190187c Failing AM test for nested layouts 2010-01-26 09:27:54 -06:00
José Valim
48a3985dd7 Also include translation in ActionMailer. 2010-01-26 16:18:29 +01:00
José Valim
52bb455c0d Merge branch 'master' of git://github.com/rails/rails 2010-01-26 16:05:32 +01:00
José Valim
1078677575 Merge remote branch 'mikel/master' 2010-01-26 16:00:57 +01:00
José Valim and Mikel Lindsaar
05c4ad9d3f Tidy up tests and docs. 2010-01-26 16:00:24 +01:00
Joshua Peek
f74fbf9d32 Keep ActionController::Base.helpers_dir around for a bit longer 2010-01-26 08:52:20 -06:00
José Valim
d7de1c76ca Add a test which ensures application can overwrite plugins/engines view paths. 2010-01-26 15:46:17 +01:00
José Valim
081dfca33a Clean up Rails::Rack::Logger. 2010-01-26 15:37:45 +01:00
José Valim
edb8131535 Move Rails::Rack::Metal to Rails::Application::Metal and just add cascade if any metal was declared. 2010-01-26 15:27:46 +01:00
José Valim
517b35a2bb Middleware stack actually runs routes and not the application. 2010-01-26 15:00:27 +01:00
José Valim
f8bf1982df Add tests for explicit engines. 2010-01-26 14:58:00 +01:00
Mikel Lindsaar
ccea6ab07d Fixing up tests and docs to use defaults :from => 'name' instead of defaults({:from => 'name'}) 2010-01-27 00:38:12 +11:00
Mikel Lindsaar
1133757a95 Merge branch 'master' of github.com:mikel/rails
Conflicts:
	actionmailer/lib/action_mailer/base.rb
2010-01-27 00:21:22 +11:00
Mikel Lindsaar
21dcc20ed2 Fixed up documentation to reflect code change and cleaned up tests of spurious #deliver calls 2010-01-27 00:18:40 +11:00
José Valim
7adb1ffc03 Remove old fixtures files. 2010-01-26 14:09:48 +01:00
Mikel Lindsaar
9520166f70 Fixed up being able to pass random headers in with headers, or mail. Also, undeprecated headers(hash) as this works now too 2010-01-27 00:06:19 +11:00
José Valim
1dca7ebc93 Refactor railties test, break huge files in smaller chunks and move initializers to application folder. 2010-01-26 13:57:11 +01:00