Commit Graph

12568 Commits

Author SHA1 Message Date
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
José Valim
dcb8b64975 Add shortcut test to abstract/render_test.rb 2010-01-21 12:12:10 +01:00
José Valim
48dc1ae309 Don't let generators die if rubygems puts crap in your load path. 2010-01-21 12:10:39 +01:00
José Valim
31fddf2ace Tidy up new filter_parameters implementation. 2010-01-21 11:57:24 +01:00
Prem Sichanugrist
b1bc3b3cd3 Add deprecation warning for calling filter_parameter_logging ActionController::Base, and allow it to be configured in config.filter_parameters
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-01-21 11:41:31 +01:00
Prem Sichanugrist
bd4f21fbac Move filter_parameter_logging logic out of the controller and create ActionDispatch::ParametersFilter to handle parameter filteration instead. This will make filteration not depending on controller anymore.
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-01-21 10:08:26 +01:00
José Valim and Mikel Lindsaar
3829f9ecfd Adding tests for attachments['blah.rb'] = {} et al 2010-01-21 20:03:55 +11:00
José Valim and Mikel Lindsaar
fbdbac2b88 Merge branch 'master' of git://github.com/rails/rails 2010-01-21 11:42:22 +11:00
Pratik Naik
fa9f000246 Use quoted_table_name with arel.from() if no from values explicitly supplied. Arel seems to be spending a lot of time figuring out the FROM value otherwise. 2010-01-21 01:37:02 +05:30
Pratik Naik
798d2828dc Cache quoted_table_name 2010-01-21 01:28:50 +05:30
Pratik Naik
24cc9e5b4f Relation#spawn is basically clone + reset 2010-01-21 00:41:15 +05:30
Pratik Naik
8bdcb6f072 Always use table.* in the finder query unless specified 2010-01-21 00:40:38 +05:30
Sam Ruby
c8cba7db76 Add AD::Route#to_s
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2010-01-20 10:56:27 -06:00
Pratik Naik
459e9b29d4 Use @limit_value and @offset_value instead of calling arel 2010-01-20 22:20:56 +05:30
Pratik Naik
8d31c9f3a0 Move update and update_all to Relation 2010-01-20 22:20:56 +05:30
Joshua Peek
93956a18e4 Only send filtered_env for notifications 2010-01-20 10:07:23 -06:00
Joshua Peek
87bcf1aa15 Request#filter_parameters and filter_env 2010-01-20 09:55:58 -06:00
Pratik Naik
f7d94cdc6d Fix AP's AR integration tests warning 2010-01-20 20:40:20 +05:30
Pratik Naik
1fb78e3ed8 Base.merge_conditions is no longer needed 2010-01-20 20:37:17 +05:30
Joshua Peek
909443eab6 Expose last controller in rack env["action_controller.instance"] 2010-01-20 09:00:23 -06:00
Santiago Pastorino
d1ffc54c06 fixes the failure of config.plugins without :all option tests [#3718 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-01-20 15:02:13 +01:00
José Valim
6e26be6960 Move ActionController::Translation to AbstractController::Translation. 2010-01-20 15:02:13 +01:00
José Valim
8e2fd54b19 Bring normalize behavior to AbstractController::Rendering 2010-01-20 15:02:13 +01:00
Pratik Naik
8b9bfbe225 Dont delegate Relation#update to arel 2010-01-20 19:01:26 +05:30
José Valim and Mikel Lindsaar
d3da87ce77 Mail method accepting all headers set via the hash 2010-01-21 00:10:22 +11:00
Pratik Naik
f216fadc0e Delegate delete_all to Relation 2010-01-20 18:33:14 +05:30
Pratik Naik
9756805676 Move destroy to Relation 2010-01-20 18:28:45 +05:30
Pratik Naik
223e2a2709 Remove Base.delete as it's same as Relation#delete 2010-01-20 18:24:36 +05:30
Pratik Naik
2493229674 Delegate exists? to Relation 2010-01-20 18:17:37 +05:30
José Valim and Mikel Lindsaar
c34cfcc29f Created mail method for new API 2010-01-20 23:46:59 +11:00
Pratik Naik
8f0f02a166 Make Relation#destroy_all handle all the cases 2010-01-20 18:12:50 +05:30
José Valim and Mikel Lindsaar
10c509fbfa Moved old API into deprecated_api.rb in preparation for new Rails 3 Mailer API 2010-01-20 22:26:24 +11:00
Mikel Lindsaar
8b37fee201 Merge branch 'master' of git://github.com/rails/rails
Conflicts:
	actionmailer/lib/action_mailer/base.rb
2010-01-20 21:58:22 +11:00
Pratik Naik
8a1be22849 Use unscoped instead of with_exclusive_scope for preloading 2010-01-20 16:11:14 +05:30
Pratik Naik
5502780c69 Move array_of_strings? to Relation 2010-01-20 14:01:42 +05:30
Pratik Naik
394c05ed82 Remove stale methods constructing joins 2010-01-20 13:24:53 +05:30
Yehuda Katz
1a50d2e66a Stop overriding LoadError.new to return a MissingSourceError (and sometimes nil!) 2010-01-19 22:35:26 -08:00
Joshua Peek
5ebfa62427 Revert streaming params parser support.
AS Xml and Json parsers expect the request body to be a real IO object
supporting methods like getc or ungetc which are not specified by the
Rack spec and aren't supported by Passenger or the Rewindable input
wrapper.

We can restore functionality if the AS parsers are rewritten to support
Racks subset of supported IO methods.
2010-01-19 22:56:38 -06:00
Joshua Peek
a5d06d05fb Cleanup middleware introspection output 2010-01-19 22:56:37 -06:00
Mikel Lindsaar
c04baed627 Fixing failing test on sendmail expectation 2010-01-20 14:12:17 +11:00