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
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