Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-08-17 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | Conflicts: actionview/README.rdoc activerecord/lib/active_record/migration.rb guides/source/development_dependencies_install.md guides/source/getting_started.md | ||||
| * | Revert "Merge branch 'master' of github.com:rails/docrails" | Vijay Dev | 2013-08-17 | 2 | -1/+3 |
| | | | | | | | | | | | | | | This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9. Seems to be a code merge done by mistake. | ||||
* | | RDoc tweaks | Xavier Noria | 2013-08-07 | 1 | -5/+10 |
| | | |||||
* | | Remove privatizing of Fixnum#/ from assert_distance_of_time_in_words | Alex Tambellini | 2013-08-05 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | MRI reimplemented Date in C so it doesn't hit this division anymore while JRuby still uses the old stdlib implementation of Date so it will always hit this. With this change the actionview date_helper_test.rb tests should pass on JRuby. | ||||
* | | Merge pull request #11743 from gaurish/tmp-magic | Guillermo Iguaran | 2013-08-05 | 1 | -0/+0 |
|\ \ | | | | | | | [Jruby] Make all tests in ActionView::TemplateDigestorTest green | ||||
| * | | Add tmp dir in actionview/test/ | Gaurish Sharma | 2013-08-05 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Missing tmp directory will cause the test to fail on JRuby. will commit adds tmp directory & 22 TemplateDigestorTests which were failing before are now green. Further Discussion on this can be seen at #11743 | ||||
* | | | Removed an unnecessary loop - it kills performance on large texts. | Jan Szumiec | 2013-08-03 | 1 | -4/+6 |
| | | | |||||
* | | | Add "extname" option to javascript_include_tag | Nathan Stitt | 2013-08-03 | 3 | -3/+27 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | ActionView::Helpers.asset_path is where the logic for javascript_include_tag resides. It takes an extname option for specifying the extension or false to not append it. This exposes that option to javascript_include_tag. Without the option files that didn't end with ".js" would get the extension appended to them. This broke JST templates and other file types that should be interpreted as JavaScript but who's file extension isn't ".js" | ||||
* | | Using URI.parser.unescape | Arun Agrawal | 2013-08-03 | 1 | -2/+2 |
| | | | | | | | | | | | | Fixes warning warning: URI.unescape is obsolete | ||||
* | | fix the changelog typo[ci skip] | Rajarshi Das | 2013-08-02 | 1 | -1/+1 |
| | | |||||
* | | Make current_page? compare binary strings | Rafael Mendonça França | 2013-08-01 | 2 | -3/+12 |
| | | |||||
* | | Fix `current_page?` when the URL contains escaped characters | Rafael Mendonça França | 2013-08-01 | 3 | -2/+20 |
| | | | | | | | | | | | | | | In some cases webservers like nginx send the escaped characters lowercased to the Rails application. The current_page? helper was comparing the escaped strings that are different since Ruby escapes the URL using uppercased characters. | ||||
* | | Moved README into action_view [ci skip] | Arun Agrawal | 2013-07-31 | 1 | -0/+5 |
| | | |||||
* | | Change from `map` => `map!` and `collect!` to save creation of extra array. | Vipul A M | 2013-07-31 | 1 | -2/+2 |
| | | |||||
* | | AV::Digestor thread safety fixes. | thedarkone | 2013-07-30 | 1 | -9/+29 |
| | | | | | | | | | | This fixes potential thread safety issues introduced in 09f6fe1. The problem with the original code was that the "recursion-stopping" `nil` values could be seen by other threads. | ||||
* | | grab executable from rubygems | Arun Agrawal | 2013-07-26 | 1 | -2/+1 |
|/ | | | As done here d7fc97d3f90c0e30865d32ce202658f03248cacc | ||||
* | Merge pull request #11341 from arunagw/added-missing-actionview-to-install | Rafael Mendonça França | 2013-07-25 | 2 | -3/+1 |
|\ | | | | | Added description in actionview gemspec. | ||||
| * | Added some description to generate actionview gem [ci skip] | Arun Agrawal | 2013-07-17 | 2 | -3/+1 |
| | | |||||
* | | text_area should handle nil value option like text_field | Joel Cogen | 2013-07-24 | 4 | -3/+24 |
| | | |||||
* | | Leave the knowledge of boolean tag values to content tag | Carlos Antonio da Silva | 2013-07-22 | 1 | -3/+3 |
| | | | | | | | | | | | | content tag already knows which tags are boolean and the values that should generate them when a truthy value is passed, so leave this logic for it instead of duplicating when generating options tags. | ||||
* | | Use merge! to avoid a new hash and change some spots to 1.9 hash style | Carlos Antonio da Silva | 2013-07-22 | 1 | -7/+7 |
| | | |||||
* | | Fix changelog syntax and use Ruby 1.9 hash style [ci skip] | Carlos Antonio da Silva | 2013-07-22 | 1 | -2/+1 |
| | | |||||
* | | syntax fix for f.select doc. [ci skip] . | Karunakar (Ruby) | 2013-07-22 | 1 | -1/+1 |
| | | |||||
* | | add support for html attributes to grouped_options_for_select | Vasiliy Ermolovich | 2013-07-20 | 3 | -1/+25 |
| | | |||||
* | | Merge pull request #11508 from vipulnsward/extract_constants | Yves Senn | 2013-07-20 | 1 | -2/+2 |
|\ \ | | | | | | | Extract verbs array from helper to a contant | ||||
| * | | Extract verbs array from helper to a constant | Vipul A M | 2013-07-20 | 1 | -2/+2 |
| | | | |||||
* | | | Fix test name typos | Vipul A M | 2013-07-19 | 1 | -2/+2 |
|/ / | |||||
* / | Use the canonical router on the CHANGELOG entry | Rafael Mendonça França | 2013-07-18 | 1 | -1/+1 |
|/ | | | | | | Thanks @egilburg [ci skip] | ||||
* | Fix default rendered format problem when calling render method without ↵ | kennyj | 2013-07-15 | 3 | -1/+11 |
| | | | | :content_type option. Closes #11393. | ||||
* | Merge pull request #11383 from mattdbridges/simple-format-doc-fix | Rafael Mendonça França | 2013-07-09 | 1 | -1/+1 |
|\ | | | | | Fix simple_format output example ending tag | ||||
| * | Fix simple_format output example ending tag | Matt Bridges | 2013-07-09 | 1 | -1/+1 |
| | | |||||
* | | Removed unused require from actionview rakefile. | Arun Agrawal | 2013-07-09 | 1 | -1/+0 |
| | | |||||
* | | Add CHANGELOG entry for #11348 | Rafael Mendonça França | 2013-07-07 | 1 | -0/+14 |
| | | |||||
* | | Merge pull request #11348 from sanemat/fix/link-to-block | Rafael Mendonça França | 2013-07-07 | 2 | -1/+8 |
|\ \ | | | | | | | Fix actionview link_to with block and url_hash | ||||
| * | | Include block in a argument shift | sanemat | 2013-07-08 | 1 | -6/+2 |
| | | | |||||
| * | | Fix link_to with block and url_hash | sanemat | 2013-07-07 | 2 | -1/+12 |
| | | | | | | | | | | | | | | | | | | Use link_to with block and url_hash, expect block as name. But ignore block and use url_hash as name. 3-2-stable passes this test. 4-0-stable and master fail this. | ||||
* | | | Fix "Stack Level Too Deep" error when rendering recursive partials | Rafael Mendonça França | 2013-07-07 | 5 | -3/+40 |
| | | | | | | | | | | | | | | | | | | | | | When rendering recursive partial Action View is trying to generate the view digest infinitly causing a stack level error. Fixes #11340 | ||||
* | | | Added an `enforce_utf8` hash option for `form_tag` method | Takayuki Matsubara | 2013-07-07 | 3 | -2/+39 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Control to output a hidden input tag with name `utf8` without monkey patching Before: form_tag # => '<form>..<input name="utf8" type="hidden" value="✓" />..</form>' After: form_tag # => '<form>..<input name="utf8" type="hidden" value="✓" />..</form>' form_tag({}, { :enforce_utf8 => false }) # => '<form>....</form>' | ||||
* | | RUNNING_UNIT_TESTS file is in rdoc [ci skip] | Arun Agrawal | 2013-07-06 | 1 | -0/+0 |
| | | |||||
* | | Remove action view test duplication | sanemat | 2013-07-07 | 1 | -3/+0 |
|/ | | | | Same test exists above 2 or 3 lines. | ||||
* | Remove the deprecated include_seconds argument from distance_of_time_in_words | Carlos Antonio da Silva | 2013-07-02 | 2 | -10/+7 |
| | | | | Pass in an :include_seconds hash option to use this feature. | ||||
* | Remove `FormBuilder` deprecation warning about block argument and associated ↵ | Vipul A M | 2013-07-02 | 3 | -17/+5 |
| | | | | tests | ||||
* | Clean the code a bit | Santiago Pastorino | 2013-06-29 | 2 | -2/+2 |
| | |||||
* | fetch value(s) from stringified options | Jon Rowe | 2013-06-29 | 4 | -2/+23 |
| | |||||
* | Review AV changelog [ci skip] | Carlos Antonio da Silva | 2013-06-27 | 1 | -2/+2 |
| | |||||
* | Remove passing the prompt to grouped_options_for_select as an argument, ↵ | kennyj | 2013-06-28 | 3 | -26/+7 |
| | | | | because it was deprecated. | ||||
* | Merge pull request #11141 from keydunov/master | Yves Senn | 2013-06-27 | 1 | -1/+1 |
|\ | | | | | Fix documentation for grouped_collection_select | ||||
| * | Fix documentation for grouped_collection_select [ci skip] | Artyom | 2013-06-27 | 1 | -1/+1 |
| | | |||||
* | | Fix copyright year for actionview [ci skip] | kennyj | 2013-06-28 | 1 | -1/+1 |
|/ | |||||
* | Minor changes to actionpack/actionview Rakefile | Arun Agrawal | 2013-06-26 | 1 | -4/+0 |
| |