Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix rendering html partial via inline render when with :js format [#1399 ↵ | Luke Melia | 2008-11-18 | 2 | -0/+15 |
| | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Register 'checked' as an HTML boolean attribute. | Hongli Lai (Phusion) | 2008-11-18 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | This way, 'tag :foo, :type => "checkbox", :checked => false' would output the expected <input type="checkbox" /> instead of the old <input type="checkbox" checked="false" /> The latter would result in a checkbox that's initially checked. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | use :en as a default locale (in favor of :en-US) | Sven Fuchs | 2008-11-18 | 4 | -41/+41 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Prevent assert_template failures when a render :inline is called before ↵ | Luke Melia | 2008-11-17 | 1 | -9/+19 |
| | | | | | | rendering a file-based template [#1383 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-15 | 7 | -109/+449 |
|\ | |||||
| * | auto_link helper: add intelligent ending closing bracket handling. add new ↵ | Mislav Marohnić | 2008-11-15 | 1 | -47/+81 |
| | | | | | | | | | | | | | | tests and reorder new ones for readability Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1353 state:committed] | ||||
| * | refactor autolink helper. change tests to expect HTML-escaped URLs | Mislav Marohnić | 2008-11-15 | 1 | -13/+24 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Make inheritance of map.resources :only/:except options behave more predictably | Tom Stuart | 2008-11-14 | 1 | -0/+26 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Make polymorphic_url compact given array [#1317 state:committed] | hiroshi | 2008-11-14 | 1 | -0/+11 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Tag helper should output an attribute with the value 'false' instead of ↵ | Hongli Lai (Phusion) | 2008-11-13 | 2 | -1/+5 |
| | | | | | | | | omitting the attribute, if the associated option is false but not nil. | ||||
| * | Fix map.resources to always generate named routes if they're needed | Tom Stuart | 2008-11-13 | 1 | -0/+78 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Instead of overriding html_types, base the verification on ↵ | Michael Koziarski | 2008-11-13 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | browser_generated_types. Also Deprecate the old unverifiable types. [#1145 state:committed] | ||||
| * | fix two MimeType failing test cases | rick | 2008-11-13 | 1 | -6/+6 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Changed request forgery protection to only worry about HTML-formatted ↵ | Jeff Cohen | 2008-11-13 | 1 | -52/+66 |
| | | | | | | | | | | | | content requests. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Add :only/:except options to map.resources | Tom Stuart | 2008-11-12 | 1 | -0/+162 |
| | | | | | | | | | | | | | | 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] | ||||
* | | Ruby 1.9 compat: rescue Exception since minitest's assertion doesn't ↵ | Jeremy Kemper | 2008-11-08 | 1 | -2/+2 |
| | | | | | | | | subclass StandardError | ||||
* | | Wrap straggling mocha user with uses_mocha block | Jeremy Kemper | 2008-11-08 | 1 | -5/+7 |
| | | |||||
* | | Ruby 1.9 compat: CGI switched back to Tempfile | Jeremy Kemper | 2008-11-08 | 1 | -10/+4 |
| | | |||||
* | | Workaround lack of Mocha on 1.9 (hasn't been updated for minitest yet) | Jeremy Kemper | 2008-11-08 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-08 | 1 | -0/+46 |
|\| | |||||
| * | Add some basic controller logging tests | Pratik Naik | 2008-11-08 | 1 | -0/+46 |
| | | |||||
* | | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-07 | 1 | -0/+1 |
|\| | |||||
| * | Work around ruby 1.9 segfault | Jeremy Kemper | 2008-11-07 | 1 | -0/+1 |
| | | |||||
| * | Don't worry about attribute ordering | Jeremy Kemper | 2008-11-07 | 1 | -1/+2 |
| | | |||||
| * | Use delete if the rhs is nil | Jeremy Kemper | 2008-11-07 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-07 | 1 | -0/+1 |
|\| | |||||
| * | auto_link view helper was failing on URLs with colons after a query param | Rich Manalang | 2008-11-07 | 1 | -0/+1 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1341 state:committed] | ||||
* | | Don't worry about attribute ordering | Jeremy Kemper | 2008-11-07 | 1 | -1/+2 |
| | | |||||
* | | Use delete if the rhs is nil | Jeremy Kemper | 2008-11-07 | 1 | -1/+5 |
| | | |||||
* | | Update AR integration tests for TestCase changes | Jeremy Kemper | 2008-11-07 | 2 | -12/+5 |
| | | |||||
* | | Move controller assertions from base TestCase to AC:: and AV::TestCase | Jeremy Kemper | 2008-11-07 | 22 | -228/+157 |
|/ | |||||
* | Fixed the sanitize helper to avoid double escaping already properly escaped ↵ | David Heinemeier Hansson | 2008-11-06 | 1 | -0/+4 |
| | | | | entities [#683 state:committed] | ||||
* | Fixed that FormTagHelper generates illegal html if name contains e.g. square ↵ | Vladimir Dobriakov | 2008-11-04 | 1 | -1/+34 |
| | | | | | | brackets [#1238 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Fix regression bug that made date_select and datetime_select raise a Null ↵ | Bernardo de Pádua | 2008-11-04 | 1 | -0/+40 |
| | | | | | | 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> | ||||
* | Cleaned up route optimisation guard condition generation code as it was ↵ | Tom Lea | 2008-11-01 | 1 | -0/+13 |
| | | | | | | | | 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> | ||||
* | Added render :js for people who want to render inline JavaScript replies ↵ | David Heinemeier Hansson | 2008-11-01 | 1 | -0/+10 |
| | | | | without using RJS [DHH] | ||||
* | Ensure content type gets reset after render_to_string [#1182 state:resolved] | Joshua Peek | 2008-10-30 | 1 | -0/+10 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-10-30 | 2 | -1/+5 |
|\ | |||||
| * | Dup local assigns for partial collections so nil values doesn't get ↵ | Joshua Peek | 2008-10-30 | 2 | -1/+5 |
| | | | | | | | | overwritten [#1250 state:resolved] | ||||
* | | Fixed regex in redirect_to to fully support URI schemes [#1247 state:committed] | Seth Fitzsimmons | 2008-10-30 | 1 | -0/+10 |
|/ | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Proper API for reloading translations | David Heinemeier Hansson | 2008-10-29 | 1 | -2/+2 |
| | |||||
* | Ensure @content_for_* is checked before yielding to block in render :layout ↵ | Ryan Bates | 2008-10-28 | 3 | -0/+15 |
| | | | | | | [#8994 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Track rendered templates in stack so the current template can always be ↵ | Joshua Peek | 2008-10-28 | 2 | -0/+5 |
| | | | | accessed. Added ActionView::Base#template to access the template object. | ||||
* | modified current_page? to ignore extra parameters unless specified in options | Erik Andrejko | 2008-10-26 | 1 | -0/+10 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#805 state:committed] | ||||
* | Fixed bug with asset timestamping when using relative_url_root (Joe ↵ | David Heinemeier Hansson | 2008-10-26 | 1 | -0/+8 |
| | | | | Goldwasser) [#1265 status:committed] | ||||
* | Fix incorrect closing CDATA delimiter. Add tests for CDATA nodes. | Jeffrey Hardy | 2008-10-23 | 1 | -0/+15 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Fix that HTML::Node.parse would blow up on unclosed CDATA sections. | Jeffrey Hardy | 2008-10-23 | 2 | -0/+31 |
| | | | | | | | | 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> | ||||
* | Dont try to auto-set the etag based on the body if any freshness headers ↵ | David Heinemeier Hansson | 2008-10-21 | 1 | -5/+22 |
| | | | | have already been set [DHH/José Valim] | ||||
* | Let fresh_when actually do the head(:not_modified). Cleaner and we get the ↵ | David Heinemeier Hansson | 2008-10-21 | 1 | -3/+1 |
| | | | | filter halting for free then. | ||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-10-21 | 1 | -1/+9 |
|\ |