Jeremy Kemper
eeea1a26ec
Merge branch 'master' into testing
2008-11-15 12:21:04 -08:00
Mislav Marohnić
4f984c9d0e
auto_link helper: add intelligent ending closing bracket handling. add new tests and reorder new ones for readability
...
Signed-off-by: Michael Koziarski <michael@koziarski.com >
[#1353 state:committed]
2008-11-15 18:30:17 +01:00
Mislav Marohnić
c6c5cd5541
refactor autolink helper. change tests to expect HTML-escaped URLs
...
Signed-off-by: Michael Koziarski <michael@koziarski.com >
2008-11-15 18:30:01 +01:00
Michael Koziarski
44c3b865ac
Missing changelogs for relative_url_root changes
2008-11-14 16:11:07 +01:00
Michael Koziarski
e4a345c1dc
Missing changelog for CSRF changes
2008-11-14 16:11:07 +01:00
Michael Koziarski
16ae82db1e
Missing changelog for :only/:except on map.resources
2008-11-14 16:11:07 +01:00
David Heinemeier Hansson
3be853b59d
A few more dependency updates
2008-11-14 14:08:26 +01:00
Pratik Naik
c70b993a9e
Merge docrails.
2008-11-14 17:47:21 +05:30
David Heinemeier Hansson
c562dfc2a7
Merge branch 'master' of git@github.com:rails/rails
2008-11-14 12:27:08 +01:00
David Heinemeier Hansson
61e43700b8
Prepare for RC2
2008-11-14 12:26:50 +01:00
Tom Stuart
2ecec6052f
Make inheritance of map.resources :only/:except options behave more predictably
...
Signed-off-by: Michael Koziarski <michael@koziarski.com >
2008-11-14 12:26:43 +01:00
hiroshi
94d6716324
Make polymorphic_url compact given array [ #1317 state:committed]
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com >
2008-11-14 12:07:52 +01:00
Hongli Lai (Phusion)
4e9abdd7f1
Tag helper should output an attribute with the value 'false' instead of omitting the attribute, if the associated option is false but not nil.
2008-11-13 21:55:58 +01:00
Tom Stuart
4c09210244
Fix map.resources to always generate named routes if they're needed
...
Signed-off-by: Michael Koziarski <michael@koziarski.com >
2008-11-13 17:49:09 +01:00
Michael Koziarski
f1ad8b48aa
Instead of overriding html_types, base the verification on browser_generated_types.
...
Also Deprecate the old unverifiable types.
[#1145 state:committed]
2008-11-13 11:23:34 +01:00
rick
00c46b5eeb
fix two MimeType failing test cases
...
Signed-off-by: Michael Koziarski <michael@koziarski.com >
2008-11-13 11:23:34 +01:00
Jeff Cohen
fbbcd6f29a
Changed request forgery protection to only worry about HTML-formatted content requests.
...
Signed-off-by: Michael Koziarski <michael@koziarski.com >
2008-11-13 11:23:21 +01:00
Tom Stuart
44a3009ff0
Add :only/:except options to map.resources
...
This allows people with huge numbers of resource routes to cut down on the memory consumption caused by the generated code.
Signed-off-by: Michael Koziarski <michael@koziarski.com >
[#1215 state:committed]
2008-11-12 12:57:58 +01:00
Jeremy Kemper
5d2b5ba23e
Merge branch 'master' into testing
2008-11-11 10:22:09 -08:00
Jeremy Kemper
278b6cd952
Eliminate excess Regexp creation due to capture counting
2008-11-10 22:21:09 -08:00
Jeremy Kemper
5db9f9b3ad
Pare down object creation during route building
2008-11-10 22:21:09 -08:00
Jeremy Kemper
d87d3f76d5
Ruby 1.9 compat: rescue Exception since minitest's assertion doesn't subclass StandardError
2008-11-08 22:46:13 -05:00
Jeremy Kemper
8bfd5edbcf
Wrap straggling mocha user with uses_mocha block
2008-11-08 22:43:56 -05:00
Jeremy Kemper
eda9f49d57
Ruby 1.9 compat: CGI switched back to Tempfile
2008-11-08 22:43:29 -05:00
Jeremy Kemper
8a1f913381
Workaround lack of Mocha on 1.9 (hasn't been updated for minitest yet)
2008-11-08 22:35:30 -05:00
Jeremy Kemper
ace9e533dc
Merge branch 'master' into testing
2008-11-08 18:58:29 -05:00
Pratik Naik
5cc27f2b03
Add some basic controller logging tests
2008-11-08 18:45:19 +05:30
Jeremy Kemper
c0310bde48
Merge branch 'master' into testing
2008-11-07 21:51:08 -05:00
Jeremy Kemper
0be5bc3f59
Work around ruby 1.9 segfault
2008-11-07 21:50:39 -05:00
Jeremy Kemper
425382d95f
Don't worry about attribute ordering
2008-11-07 21:21:10 -05:00
Jeremy Kemper
07fe3370f8
Check whether last arg is a Hash instead of duck-typing against []
2008-11-07 21:20:26 -05:00
Jeremy Kemper
aaa2abf73f
Use delete if the rhs is nil
2008-11-07 21:19:02 -05:00
Jeremy Kemper
0994d11f26
Merge branch 'master' into testing
2008-11-07 19:55:29 -05:00
Jeremy Kemper
c77e6ace66
Check whether last arg is a Hash instead of duck-typing against []
2008-11-07 17:46:03 -05:00
Jeremy Kemper
99648c9672
Don't worry about attribute ordering
2008-11-07 17:45:10 -05:00
Jeremy Kemper
110c044e20
Use delete if the rhs is nil
2008-11-07 17:44:31 -05:00
Nick Sieger
529c271699
Simplify dispatcher callbacks to eliminate unnecessary stale thread purging. [Nick Sieger, Pratik Naik]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com >
2008-11-08 03:49:54 +05:30
Jeremy Kemper
4af46c4ba1
Update AR integration tests for TestCase changes
2008-11-07 15:51:50 -05:00
Jeremy Kemper
c82e8e1f48
Move controller assertions from base TestCase to AC:: and AV::TestCase
2008-11-07 15:42:34 -05:00
Rich Manalang
d3ec1d3c22
auto_link view helper was failing on URLs with colons after a query param
...
Signed-off-by: Michael Koziarski <michael@koziarski.com >
[#1341 state:committed]
2008-11-07 19:33:18 +00:00
Jeremy Kemper
d355921709
Remove controller assertions from Test::Unit::TestCase. Use ActionController::TestCase.
2008-11-07 13:27:06 -05:00
Aliaksey Kandratsenka
099f10679e
Don't eval recognize_optimized use __FILE__ and __LINE__ in the optimised recognition code.
...
It produces meaningless line numbers. This also easily produces line numbers greater than recognition_optimization.rb have, which causes rcov to trash memory outside of it's coverage counting arrays.
[#1319 state:committed]
Signed-off-by: Michael Koziarski <michael@koziarski.com >
2008-11-06 19:52:44 +00:00
Michael Koziarski
af5b304a40
Fix stupid typo
2008-11-06 18:52:02 +00:00
David Heinemeier Hansson
a358d87e16
Fixed the sanitize helper to avoid double escaping already properly escaped entities [ #683 state:committed]
2008-11-06 13:02:32 +01:00
David Heinemeier Hansson
55707da1a1
Dont bother logging the parameters hash if there are no parameters
2008-11-06 09:59:11 +01:00
Vladimir Dobriakov
5fad229e43
Fixed that FormTagHelper generates illegal html if name contains e.g. square brackets [ #1238 state:committed]
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com >
2008-11-04 18:24:52 +01:00
Bernardo de Pádua
b2cd318c2e
Fix regression bug that made date_select and datetime_select raise a Null Pointer Exception when a nil date/datetime was passed and only month and year were displayed [ #1289 state:committed]
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com >
2008-11-04 18:15:54 +01:00
David Heinemeier Hansson
a909eecbbd
Dont log the _method attribute either. Its already available in the header
2008-11-04 18:14:29 +01:00
David Heinemeier Hansson
b29f95ed9a
Dont log the _method attribute either. Its already available in the header
2008-11-04 18:12:32 +01:00
Pratik Naik
18bf7b421d
Remove unused debug_routes
2008-11-02 23:23:19 +05:30
