Commit Graph

12607 Commits

Author SHA1 Message Date
José Valim and Mikel Lindsaar
5dead5bb88 Maintain old_api and deprecated_api in different files. 2010-01-24 17:49:48 +01:00
José Valim and Mikel Lindsaar
f30d73bab4 Add new class delivery method API. 2010-01-24 17:31:18 +01:00
José Valim and Mikel Lindsaar
7409b73484 Some refactoring. 2010-01-24 16:37:28 +01:00
José Valim and Mikel Lindsaar
73a9000402 Adding failing tests for calling just the action, instead of :create_action_name and :deliver_action_name 2010-01-24 20:38:53 +11:00
José Valim and Mikel Lindsaar
afc758297c Moving AS::Notifications call to one location in base 2010-01-24 12:30:13 +11:00
José Valim and Mikel Lindsaar
258ca14800 Delegated ActionMailer::Base.deliveries to Mail.deliveries, added callback support in Mail to call ActionMailer on delivery, moved deliver to deprecated API in preparation for new API 2010-01-24 11:15:42 +11:00
José Valim and Mikel Lindsaar
e7e4ed48df Set sort order for explicit parts from the collector's template sequence 2010-01-24 09:34:50 +11:00
José Valim and Mikel Lindsaar
c985a0ee3d Add some tests to collector with templates and any. 2010-01-23 12:46:40 +01:00
José Valim and Mikel Lindsaar
6ba944608e Make implicit and explicit templates pass through the same part creation process. 2010-01-23 12:20:20 +01:00
José Valim and Mikel Lindsaar
5a19d24892 Adding collector to ActionMailer 2010-01-23 21:50:36 +11:00
José Valim and Mikel Lindsaar
c6b16260fe Added basic explicit multipart rendering and tests 2010-01-23 21:37:34 +11:00
José Valim and Mikel Lindsaar
502028a32b Move double render check out of AbstractController. 2010-01-23 10:29:22 +01:00
José Valim and Mikel Lindsaar
5c3ef8c17d Refactor subject with i18n. 2010-01-23 10:24:19 +01:00
José Valim and Mikel Lindsaar
ddfc0725a0 Added AbstractController::Collector. 2010-01-23 10:23:06 +01:00
Mikel Lindsaar
1ea84c38ea Merge branch 'master' of git://github.com/rails/rails 2010-01-23 19:45:25 +11:00
Pratik Naik
8ff2fb6f3a Make default_scope work with Relations 2010-01-23 13:41:09 +05:30
Mikel Lindsaar
bd24c75fc6 Updated Gemspec to mail 2.0.3 from gemcutter 2010-01-23 18:45:59 +11:00
Joshua Peek
c2e57c0bb0 I removed the rdoc task from plugin Rakefile 2010-01-22 13:56:10 -06:00
Joshua Peek
2db14457f4 Delegate App calls to instance 2010-01-22 13:56:10 -06:00
José Valim
d618b7e3dc Ensure strings given to render with slash are rendered relative to the configured _prefix. 2010-01-22 17:58:03 +01:00
Prem Sichanugrist
cc6f16685c Add test case for load initializers before routing behavior.
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-01-22 17:58:03 +01:00
Xavier Noria
5c53ffe1db Add missing require for Object#try [#3771 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2010-01-22 22:20:00 +05:30
Joshua Peek
1a750da130 Make @controller an internal ivar in the view 2010-01-22 10:19:01 -06:00
Pratik Naik
4afd9702fe Relation should respond to class methods 2010-01-22 20:14:37 +05:30
Pratik Naik
ee8c006dac Allow calling class methods on a Relation 2010-01-22 20:10:41 +05:30
Joshua Peek
c52820ae15 Use expand_path to require environment in metal template 2010-01-22 08:34:12 -06:00
Joshua Peek
284fd2568d Include cascade header in metal template 2010-01-22 08:31:41 -06:00
Joshua Peek
658f9e7e44 lib is already included w/ rake test task 2010-01-22 08:29:42 -06:00
Joshua Peek
5bf5688f51 Remove rdoc task from generated plugin Rakefile 2010-01-22 08:29:07 -06:00
Joshua Peek
259f3846a9 Template whitespace 2010-01-22 08:27:05 -06:00
José Valim and Mikel Lindsaar
951397b4a2 Get implicit multipart and attachments working together. 2010-01-22 14:38:41 +01:00
José Valim and Mikel Lindsaar
1cd55928c6 First work on implicit multipart. 2010-01-22 13:56:06 +01:00
José Valim and Mikel Lindsaar
dcb9253693 Add basic template rendering to new DSL. 2010-01-22 13:27:26 +01:00
Mikel Lindsaar
6cf378aeb0 Merge branch 'master' of github.com:mikel/rails 2010-01-22 21:58:13 +11:00
José Valim and Mikel Lindsaar
b30eb39ff0 Add more tests to new API. 2010-01-22 11:57:54 +01:00
Mikel Lindsaar
1170e70797 Merge branch 'master' of github.com:mikel/rails 2010-01-22 21:10:52 +11:00
José Valim and Mikel Lindsaar
bb9d71ff9e Move class methods to deprecated stuff. 2010-01-22 11:10:37 +01:00
José Valim and Mikel Lindsaar
343ac48f45 Moved deprecated_body.rb to deprecatead_api.rb 2010-01-22 11:01:21 +01:00
Mikel Lindsaar
6fd7d1fc12 Fixing typo in config.frameworks error 2010-01-22 19:38:50 +11:00
José Valim and Mikel Lindsaar
8a6a2ca712 Merge branch 'master' of git://github.com/rails/rails 2010-01-22 13:37:29 +11:00
José Valim and Mikel Lindsaar
c9dc1ac95b Updating functional tests to not compare equality with encoded, Mail::Message has an == operator 2010-01-22 13:32:16 +11:00
José Valim and Mikel Lindsaar
90bbed233e Updating deprecated_body.rb to use :content instead of :data or :body in the params hash 2010-01-22 12:51:07 +11:00
José Valim and Mikel Lindsaar
77986f6bdb Added use of AS::Notifications for tmail_compat.rb 2010-01-22 12:49:13 +11:00
José Valim and Mikel Lindsaar
12c001fec4 Updating deprecated API to sanitize old style attachments hash to work with new mail.attachments method 2010-01-22 12:46:19 +11:00
Pratik Naik
6d30002a52 Revert "Refactoring attributes/types" [#3348 state:open]
This reverts commit f936a1f100.

Conflicts:

	activerecord/lib/active_record.rb
	activerecord/lib/active_record/base.rb

Revert "Fixed: #without_typecast should only disable typecasting on the duplicated attributes" [#3387 state:open]

This reverts commit 2831996483.

Reason :

  It's not generating attribute methods properly, making object.column 5x slower.
2010-01-22 02:37:07 +05:30
Pratik Naik
a68a3e9af6 Simplify finder method definitions 2010-01-21 22:29:21 +05:30
José Valim
fc4f237864 Make filter parameters based on request, so they can be modified for anything in the middleware stack. 2010-01-21 16:52:49 +01:00
José Valim
04063393f9 Give higher priority to rails generators. 2010-01-21 14:11:24 +01:00
Pratik Naik
da142cd865 Supplying Arel::SqlLiteral is much faster 2010-01-21 17:52:09 +05:30
José Valim
378464a2e4 Default to sync instrumentation. 2010-01-21 13:09:12 +01:00