Commit Graph

7791 Commits

Author SHA1 Message Date
Jon Leighton
7af719e81c Deprecate set_sequence_name in favour of self.sequence_name= 2011-11-29 20:13:37 +00:00
Jon Leighton
0b72a04d0c Deprecate set_table_name in favour of self.table_name= or defining your own method. 2011-11-29 20:13:36 +00:00
Marc-Andre Lafortune
d3bc12b27f Handle correctly optional parameters for callable asset_host. 2011-11-29 02:01:18 -05:00
lest
fe7d4f09ef put backtrace_cleaner to env 2011-11-28 19:25:37 +03:00
Vijay Dev
9ca58ba492 Revert "use any? to check for size"
This reverts commit c4af5f00f6.
2011-11-28 16:29:55 +05:30
Vasiliy Ermolovich
2559256963 update CHANGELOG 2011-11-28 10:54:12 +03:00
Vasiliy Ermolovich
fb8b555c49 add namespace options to form_for
You can provide a namespace for your form to ensure uniqueness of id attributes on form elements.
The namespace attribute will be prefixed with underscore on the generate HTML id
2011-11-27 23:41:23 +03:00
lest
bc81ba2451 fix label with block in erb 2011-11-27 16:59:44 +03:00
Vijay Dev
1d89540686 Merge branch 'master' of github.com:lifo/docrails 2011-11-26 19:14:39 +05:30
Vijay Dev
c4af5f00f6 use any? to check for size 2011-11-26 18:52:10 +05:30
Xavier Noria
b6916e0b92 removes a Serialization constant left in the previous revert 2011-11-25 15:06:30 -08:00
José Valim
0a4035b12a Revert the serializers API as other alternatives are now also under discussion 2011-11-25 19:29:39 +00:00
José Valim
6f5fdf8179 Merge pull request #3747 from lest/middleware-logger
middlewares should have configurable logger
2011-11-25 05:33:26 -08:00
Uģis Ozols
a607a9d978 what's -> that's 2011-11-25 14:24:14 +02:00
Uģis Ozols
9a45867b09 Remove unnecessary comment. 2011-11-25 14:22:36 +02:00
lest
cd9d28d6fd middlewares should use logger from env 2011-11-25 13:09:46 +03:00
José Valim
fcacc6986a Merge branch 'serializers'
This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides.

From José and Yehuda with love.

Conflicts:
	railties/CHANGELOG.md
2011-11-25 09:59:35 +00:00
José Valim
696d01f7f4 Add docs to serializers. Update CHANGELOGs. 2011-11-25 09:49:54 +00:00
José Valim
7fcc8c0a1f Rely solely on active_model_serializer and remove the fancy constant lookup. 2011-11-23 23:45:27 +00:00
lest
98a1717e7c configuration option to always write cookie 2011-11-23 23:50:04 +03:00
José Valim
e62de52aa3 Merge branch 'master' into serializers 2011-11-23 20:43:06 +00:00
Yehuda Katz
e9f63c55f8 Merge pull request #3733 from kennyj/fix_warnings_for_show_exceptions_test
Warnings removed. (ambiguous first argument)
2011-11-23 11:10:27 -08:00
José Valim
fd86a1b6b0 Rely on a public contract between railties instead of accessing railtie methods directly. 2011-11-23 19:06:45 +00:00
kennyj
ea70e027b6 Remove unreachable code, and add additional testcases. 2011-11-24 00:25:34 +09:00
kennyj
453f5534b4 Warnings removed. (ambiguous first argument) 2011-11-24 00:10:34 +09:00
Marc Chung
745b7a1437 - Avoid using .first since it will create an additional query.
- Handle scenario where @posts is empty.
2011-11-22 17:04:19 -07:00
Yehuda Katz
9b7be78820 Merge pull request #3724 from marcandre/media_default
stylesheet_tag default's media is "screen"
2011-11-22 12:38:05 -08:00
Marc-Andre Lafortune
05e02deb68 Make explicit the default media when calling stylesheet_tag and change the default generators. 2011-11-22 15:16:23 -05:00
José Valim
b13b49ccc1 Merge pull request #3718 from lest/fix-javascript-include-tag
javascript_include_tag should add '.js' to sources that contain '.'
2011-11-22 09:45:11 -08:00
lest
3a1d51959b deprecation warning, changelog entry 2011-11-22 17:36:58 +03:00
lest
aa491f6a9c javascript_include_tag should add '.js' to sources that contain '.' 2011-11-22 16:39:07 +03:00
lest
5bcd119b8d move show_detailed_exceptions? to Rescue module 2011-11-22 13:34:13 +03:00
lest
c6d6b28bb4 refactor show exceptions tests 2011-11-22 11:38:55 +03:00
lest
a9e8cf78fd add ActionController::Metal#show_detailed_exceptions? 2011-11-22 11:38:24 +03:00
Aaron Patterson
3d2bd69385 Revert "copy options keys to the right place so that undo will work correctly"
This reverts commit 3178cc9a80.
2011-11-19 20:35:54 -08:00
Yehuda Katz
bc04455f10 Merge pull request #3695 from tobiassvn/partial_path_error
Meaningful errors for unexpected partial arguments. Fixes #3573
2011-11-19 07:38:22 -08:00
Jon Leighton
603a679e87 Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685. 2011-11-19 13:28:07 +00:00
Jon Leighton
86b5e81e8a Bump sprockets to 2.1.1 2011-11-19 13:08:34 +00:00
Tobias Svensson
771635e858 Meaningful errors for unexpected partial arguments. Fixes #3573 2011-11-19 13:05:57 +00:00
Arun Agrawal
d806ea2050 Warning removed for shadowing variable 2011-11-19 11:29:29 +05:30
Aaron Patterson
396ef44be4 Revert "make sure to require the right deprecation warning file"
This reverts commit 9d725e3df502a07222f35576108eb2df2bd88259.
2011-11-18 10:51:12 -08:00
Aaron Patterson
99d94f126d Refactoring the redirect method for the router api. 2011-11-18 10:51:12 -08:00
Aaron Patterson
d34efdd260 moving redirection to objects 2011-11-18 10:51:12 -08:00
Aaron Patterson
0809c675ef remove the :path feature to redirects, since it cannot work 2011-11-18 10:51:11 -08:00
Aaron Patterson
a8a4264858 make sure to require the right deprecation warning file 2011-11-18 10:51:11 -08:00
Aaron Patterson
163b645472 arity check has been pushed up, so no need for proc wrapping 2011-11-18 10:51:11 -08:00
Aaron Patterson
4589b2419b require that all blocks have arity of 2 2011-11-18 10:51:11 -08:00
Aaron Patterson
3178cc9a80 copy options keys to the right place so that undo will work correctly 2011-11-18 10:51:11 -08:00
Aaron Patterson
ecbae99478 no need for type checking 2011-11-18 10:51:11 -08:00
Aaron Patterson
636405d2a6 cleaning up variable names to match method parameter names 2011-11-18 10:51:10 -08:00