github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-20 03:00:32 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,345 Commits 34 Branches 105 Tags
ff594b2bc94ff2a942fe6ca05672387722dee686
Commit Graph

1564 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Tom Lea
5a02f0bccf Cleaned up route optimisation guard condition generation code as it was getting a little messy. 
Add additional condition to handle the case where default_url_options is only defined in the controller, not the view.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-11-01 19:06:25 +01:00
David Heinemeier Hansson
cbeac93310 Added render :js for people who want to render inline JavaScript replies without using RJS [DHH] 2008-11-01 12:03:49 +01:00
Joshua Peek
2092687bcb Ensure content type gets reset after render_to_string [#1182 state:resolved] 2008-10-30 15:26:29 -05:00
David Heinemeier Hansson
7857e42103 Merge branch 'master' of git@github.com:rails/rails 2008-10-30 21:11:46 +01:00
Seth Fitzsimmons
47b4fa4a62 Fixed regex in redirect_to to fully support URI schemes [#1247 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-10-30 21:07:50 +01:00
Joshua Peek
ec38c84ce1 Dup local assigns for partial collections so nil values doesn't get overwritten [#1250 state:resolved] 2008-10-30 15:07:47 -05:00
David Heinemeier Hansson
4dbfe18b37 Proper API for reloading translations 2008-10-29 10:51:56 +01:00
Ryan Bates
4ad5aa9a39 Ensure @content_for_* is checked before yielding to block in render :layout [#8994 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-10-28 17:31:33 -05:00
Joshua Peek
ac50ee0edf Track rendered templates in stack so the current template can always be accessed. Added ActionView::Base#template to access the template object. 2008-10-28 11:06:08 -05:00
Erik Andrejko
ef9b6b5cba modified current_page? to ignore extra parameters unless specified in options 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#805 state:committed]
 2008-10-26 19:14:45 +01:00
David Heinemeier Hansson
2c7abe1b56 Fixed bug with asset timestamping when using relative_url_root (Joe Goldwasser) [#1265 status:committed] 2008-10-26 16:50:18 +01:00
Jeffrey Hardy
3bcadc9290 Fix incorrect closing CDATA delimiter. Add tests for CDATA nodes. 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-10-23 19:16:26 -07:00
Jeffrey Hardy
1a18227261 Fix that HTML::Node.parse would blow up on unclosed CDATA sections. 
If an unclosed CDATA section is encountered and parsing is strict, an
exception will be raised. Otherwise, we consider the remainder of the line to
be the section contents. This is consistent with HTML::Tokenizer#scan_tag.

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-10-23 19:16:12 -07:00
David Heinemeier Hansson
18542c9e00 Dont try to auto-set the etag based on the body if any freshness headers have already been set [DHH/José Valim] 2008-10-21 16:58:12 +02:00
David Heinemeier Hansson
448e7e7c04 Let fresh_when actually do the head(:not_modified). Cleaner and we get the filter halting for free then. 2008-10-21 02:54:55 +02:00
David Heinemeier Hansson
68d84e2593 Merge branch 'master' of git@github.com:rails/rails 2008-10-21 02:30:57 +02:00
David Heinemeier Hansson
9acb88e666 Added stale?/fresh? and fresh_when methods to provide a layer of abstraction above request.fresh? and friends [DHH] 2008-10-21 02:30:13 +02:00
Tim Harper
fcb45e5ec3 Ensure ActionView::Helpers::AssetTagHelper::AssetTag::Cache is cleared before loading so changes to asset files are picked up by the broswer [#1233 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-10-20 13:21:59 -05:00
David Heinemeier Hansson
1abdc8752d Added inline builder yield to atom_feed_helper tags where appropriate (Sam Ruby) [#8994 status:committed] 2008-10-13 19:52:37 +02:00
Matthew M. Boedicker
42cbd710bb Add support for xml processing instructions in atom_feed_helper [#926 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-10-13 18:46:32 +02:00