Neeraj Singh
f587dec2c9
truncate safe method description changes
2010-06-14 09:12:10 -04:00
Rizwan Reza
bf7429041e
Merge branch 'master' of git://github.com/rails/rails
2010-06-14 13:13:13 +04:30
Neeraj Singh
e574ca920d
render(:inline) in a layout before yield replaces original content
...
[#4777 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-13 13:56:08 +02:00
Santiago Pastorino
27f337d54f
truncate documentation an examples added for :safe option
2010-06-13 06:11:23 -03:00
Santiago Pastorino
6865b5e4eb
Bump rack-mount version to 0.6.4
2010-06-12 18:47:37 -07:00
Xavier Noria
d433c504b5
removes spurious .rb in require
2010-06-12 22:10:59 +02:00
rohit
7508c0e9d3
Change sanitize to escape in test names of text_helper_test [ #4844 state:resolved]
2010-06-12 15:34:05 +02:00
Xavier Noria
f2991fc9cc
Merge remote branch 'docrails/master'
2010-06-12 00:30:48 +02:00
Jeremy Kemper
acad3ba848
Ruby 1.9.1 compat: constant lookup
2010-06-11 11:00:56 -07:00
Santiago Pastorino
b4976ce91b
text_helper now escape the unsafe input instead of sanitizing
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-11 16:34:53 +02:00
Rizwan Reza
51ad68367a
Added tests for cookies with domain option.
2010-06-11 16:34:53 +02:00
Rizwan Reza
132730d5db
Moved test/controller/cookie_test.rb to test/dispatch/cookies_test.rb
2010-06-11 16:34:53 +02:00
Rizwan Reza
b602ce6191
Refactored duplication into a separate method. Dropped class variable.
2010-06-11 16:34:53 +02:00
Rizwan Reza
6148b2dd73
Adding missing docs to delete cookies with :all which were added that way.
2010-06-11 16:34:53 +02:00
Rizwan Reza
f99132663b
Took out the domain option logic to cookies.rb.
2010-06-11 16:34:52 +02:00
Rizwan Reza
5609149d84
Moved Domain regexp to a constant and added comments.
2010-06-11 16:34:52 +02:00
Rizwan Reza
edbb78d6cc
The previous commit didn't work with complex domains, which is now fixed.
2010-06-11 16:34:52 +02:00
Rizwan Reza
44830ead1c
Add support for multi-subdomain session by setting cookie host in session cookie so you can share session between www.example.com, example.com and user.example.com. [ #4818 state:resolved]
...
This reverts commit 330a89072a493aafef1e07c3558964477f85adf0.
2010-06-11 16:34:52 +02:00
Xavier Noria
4278e7f2b3
adds missing require for having ActiveSupport::InheritableOptions defined
2010-06-11 15:23:24 +02:00
Xavier Noria
b69a2db952
adds missing require for having ActiveSupport::InheritableOptions defined
2010-06-11 15:20:26 +02:00
Slobodan Kovacevic
5a745575be
Updated all number helpers with :locale option.
2010-06-11 14:04:38 +02:00
Xavier Noria
6356066006
Merge remote branch 'rails/master'
2010-06-10 22:00:55 +02:00
José Valim
330a89072a
Revert "Add support for multi-subdomain session by setting cookie host in session cookie so you can share session between www.example.com, example.com and user.example.com. [ #4818 state:resolved]"
...
It does not work for domains like co.uk and com.br.
This reverts commit c4d6245e875bbb276c122a5a401422d341dac4df.
2010-06-10 20:08:01 +02:00
Alan Harper
566967eaf3
Missing method error doesn't specify which controller it is missing from [ #4436 state:resolved]
...
The error page shown when the method you are requesting on a controller
doesn't specify which controller the method is missing from
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-10 20:04:37 +02:00
José Valim
51590ad175
Remove punctuate_body! No code in lib was using it and it had no documentation.
2010-06-10 19:49:10 +02:00
José Valim
b67ec8ba20
class_attribute is not a direct replacement of class_inheritable_*.
...
If you are setting a hash or an array in class_attribute or you need
to freeze it, to ensure people won't modify it in place or you need
to dup it on inheritance.
2010-06-10 19:39:09 +02:00
Guillermo Álvarez
c4d6245e87
Add support for multi-subdomain session by setting cookie host in session cookie so you can share session between www.example.com, example.com and user.example.com. [ #4818 state:resolved]
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2010-06-10 12:05:12 -04:00
Slobodan Kovacevic
59e89facc2
Added :locale option explanation for number_to_currency
2010-06-10 14:58:02 +02:00
José Valim
211799450d
Ensure show exceptions middleware properly filters backtrace before logging.
2010-06-09 22:49:14 +02:00
Santiago Pastorino
0919c0dbca
Removed textilize, textilize_without_paragraph and markdown helpers
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-09 10:06:14 +02:00
Neeraj Singh
f48aa14bf4
Better test for ticket [ #3914 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-09 09:51:05 +02:00
José Valim
5c9f27abaa
Add more cases to previous commit [ #4394 state:resolved]
2010-06-08 23:26:51 +02:00
Jan De Poorter
4560385fa4
Make sure namespaces are nested within resources
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-08 23:21:53 +02:00
Neeraj Singh
db23a95a61
cache_sweeper yields blank output
...
[#3914 state:open]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-08 23:20:04 +02:00
David Heinemeier Hansson
03be27092b
Revert "Add shallow routes to the new router" for now. Needs more work.
...
This reverts commit 67a60ee314f53abcde78f8ecd2a1f7c9ef8264e1.
2010-06-08 16:20:46 -04:00
David Chelimsky
bdcf70cca8
Memoize the object returned by _view in ActionView::TestCase::Behavior
...
[#4799 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-08 21:25:31 +02:00
David Heinemeier Hansson
32d4330b81
Get ready for beta 4
2010-06-08 14:47:02 -04:00
David Heinemeier Hansson
585f8f27b1
Fixed double output from cache in no caching mode
2010-06-08 14:47:02 -04:00
José Valim
68b4720fd1
Accept both regexps and strings for LOCALHOST.
2010-06-08 20:11:05 +02:00
Prem Sichanugrist
c6ad64394b
Make sure that rails recognized the full notation of IPv6 loopback address, and recognize 127.0.0.0/8 in IPv4
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-08 19:45:40 +02:00
Andrew White
a7edddf605
Fix resources ignoring scope options
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-08 19:33:27 +02:00
rohit
47bf19c848
Made markdown honor :safe option and handle safe input. Also added tests for markdown.
...
[#4794 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-08 17:00:11 +02:00
Andrew White
4740fbac85
Add support for actions on a new resource to the new routing DSL [ #4328 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-08 09:11:39 +02:00
rohit
67f411c57b
Fixed textilize_without_paragraph and added tests for it. [ #4792 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-08 09:11:34 +02:00
Mikel Lindsaar
e404490f9b
Merge branch 'master' of git://github.com/rails/rails
2010-06-08 00:10:11 -04:00
Mikel Lindsaar
21cc1ed437
Updating image_tag to support cid:content_id "URLs"
2010-06-07 21:53:31 -04:00
Diego Carrion
67a60ee314
Add shallow routes to the new router [ Closes #3765 ]
2010-06-07 18:09:20 -05:00
wycats
d6953cbfd3
regular expressions are usually ASCII-encoded, so force_encoding the content of a Node to the encoding of the regular expression is wrong.
2010-06-07 18:06:08 -04:00
José Valim
981f81275b
Fix case when rendering a partial inside RJS with inherited layout [ #4786 state:resolved]
2010-06-07 22:22:54 +02:00
Santiago Pastorino
ab764ecbfe
Makes text_helper methods sanitize the input if the input is not safe or :safe => true option is not provided
2010-06-07 15:31:21 -04:00