Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-30 | 1 | -1/+1 |
|\ | |||||
| * | fix typo in render_template [ci skip] | Brent Vatne | 2012-05-29 | 1 | -1/+1 |
| | | |||||
* | | Review requires from number helper | Carlos Antonio da Silva | 2012-05-28 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | Some of these requires are now only necessary in ActiveSupport::NumberHelper. Add hash/keys require due to symbolize_keys usage in number helpers. Also remove some whitespaces. Closes #6414 | ||||
* | | Parse float value only once in number helpers | Carlos Antonio da Silva | 2012-05-28 | 1 | -11/+11 |
| | | | | | | | | | | Refactor number helpers output with safety handling to call float parsing only once. Also remove 'erb' require. | ||||
* | | Moving NumberHelpers from ActionView to ActiveSupport | Andrew Mutz | 2012-05-27 | 2 | -285/+38 |
|/ | |||||
* | Add `:escape` option for `truncate` | Rafael Mendonça França | 2012-05-26 | 1 | -2/+5 |
| | | | | This options can be used to not escape the result by default. | ||||
* | Update the documentation and add CHANGELOG entry | Rafael Mendonça França | 2012-05-26 | 1 | -3/+3 |
| | |||||
* | Test that the block used in truncate is escaped if it is not HTML safe | Rafael Mendonça França | 2012-05-26 | 1 | -13/+12 |
| | | | | Refactoring the truncate method to not do a sort-circuit return | ||||
* | Truncate now has the ability to receive a html option that allows it to call ↵ | Li Ellis Gallardo | 2012-05-26 | 1 | -2/+12 |
| | | | | | | | | | | | | rails helpers. This way if my text is long I don't have to do something like this: .text = truncate(@text, :length => 27) if @text.size >= 27 = link_to "continue", notes_path, ....."") | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-23 | 1 | -1/+1 |
|\ | |||||
| * | Revert "Remove blank trailing comments" | Vijay Dev | 2012-05-23 | 13 | -0/+39 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a. Reason: Not a fan of such massive changes. We usually close such changes if made to Rails master as a pull request. Following the same principle here and reverting. [ci skip] | ||||
| * | Fix incorrect example for fields_for - without the '=' it will not output ↵ | David Morton | 2012-05-22 | 1 | -1/+1 |
| | | | | | | | | anything. | ||||
| * | Remove blank trailing comments | Henrik Hodne | 2012-05-20 | 13 | -39/+0 |
| | | | | | | | | | | | | | | For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace with the first match, and voilà! Note that the regex matches a little bit too much, so you probably want to `git add -i .` and go through every single diff to check if it actually should be changed. | ||||
* | | Refactor date related helpers | Carlos Galdino | 2012-05-22 | 6 | -50/+26 |
| | | |||||
* | | Merge pull request #6359 from carlosgaldino/add-html5-inputs | Jeremy Kemper | 2012-05-22 | 8 | -0/+248 |
|\ \ | | | | | | | Add HTML5 color and date/time inputs | ||||
| * | | Add several HTML5 input helpers | Carlos Galdino | 2012-05-21 | 7 | -0/+205 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The input types added are: - input[type="month"] - input[type="week"] - input[type="datetime"] - input[type="datetime-local"] | ||||
| * | | Add HTML5 input[type="color"] helper | Carlos Galdino | 2012-05-21 | 4 | -0/+43 |
| | | | |||||
* | | | Fixed typo new_defautls -> new_defaults. | Philip Arndt | 2012-05-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | * Added tests for 'else' case in ActionView::Helpers::TranslationHelper#wrap_translate_defaults * Also updated the testing syntax of translation.html_safe? asserts to provide better output upon failure. | ||||
* | | | Revert "Merge pull request #6425 from pinetops/resolver_concurrency_fix" | José Valim | 2012-05-21 | 1 | -68/+19 |
| | | | | | | | | | | | | | | | This reverts commit 254c04286c5916ae7f91eb6e173b312e7a74e364, reversing changes made to 513a0525c24c2944630acfa465b22cd2f4601adf. | ||||
* | | | Merge pull request #6425 from pinetops/resolver_concurrency_fix | Aaron Patterson | 2012-05-21 | 1 | -19/+68 |
|\ \ \ | |/ / |/| | | Resolver concurrency fix | ||||
| * | | More granular locking of the Resolver template cache | Tom Clarke | 2012-05-21 | 1 | -5/+23 |
| | | | | | | | | | | | | | | | | | | | | | In order to avoid holding a global lock when doing template resolution, instead add individual locks on a per cache entry basis. The global lock is now only used for manipulation of the main cache data structure. | ||||
| * | | Make the Resolver template cache threadsafe - closes #6404 | Tom Clarke | 2012-05-21 | 1 | -19/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Template cache in the Resolver can be accessed by multiple threads similtaneously in multi-threaded environments. The cache is implemented using a Hash, which isn't threadsafe in all VMs (notably JRuby). This commit extracts the cache to a new Cache class and adds mutexes to prevent concurrent access. | ||||
* | | | Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614c | José Valim | 2012-05-20 | 1 | -10/+22 |
| | | | | | | | | | | | | | | | | | | | | | Template concurrency fixes Conflicts: actionpack/lib/action_view/template.rb | ||||
* | | | fix closing tag [ci skip] | Vijay Dev | 2012-05-20 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-19 | 1 | -1/+4 |
|\ \ | |||||
| * | | minor fix wrapper tag documentation | Francesco Rodriguez | 2012-05-18 | 1 | -1/+1 |
| | | | |||||
| * | | Minor fix to the wrapper tag documentation, the options hash is the last ↵ | Avi Tzurel | 2012-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | one, added blank hash before that in the args list | ||||
| * | | Added wrapper tag documentation to the simple_format method | Avi Tzurel | 2012-05-19 | 1 | -1/+4 |
| | | | |||||
* | | | Clarify grouped_options_for_select method API, add changelog entry | Carlos Antonio da Silva | 2012-05-19 | 1 | -14/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the method API more clear by explicitly showing the expected arguments. This means that the options cannot be passed as second argument because we are not relying on extract_options! anymore, you are expected to give a selected key or `nil` if you want to pass options, as it is the last argument. Notice that this does not change the current method arguments contract available in 3.2, it just brings back the same functionality with the divider addition. | ||||
* | | | Merge pull request #6384 from ihid/tidy_text_helpers | Jeremy Kemper | 2012-05-18 | 1 | -14/+20 |
|\ \ \ | | | | | | | | | Tidied and standardised text_helper implementations. | ||||
| * | | | Tidied and standardised text_helper implementations. | Jeremy Walker | 2012-05-19 | 1 | -14/+20 |
| | | | | |||||
* | | | | reverting decoupling of NumberHelper from safe_join and adding tests for ↵ | Andrew Mutz | 2012-05-18 | 1 | -1/+1 |
|/ / / | | | | | | | | | | escaping of delimiters and separators | ||||
* | | | Merge pull request #5020 from KL-7/fix-blank-image_tag-source | José Valim | 2012-05-17 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Render img tag with empty src if empty string is passed to image_tag. | ||||
| * | | | Render img tag with empty src if empty string is passed to image_tag. | Kirill Lashuk | 2012-05-18 | 1 | -2/+2 |
| | |/ | |/| | |||||
* / | | Add HTML5 input[type="time"] helper | Alex Soulim | 2012-05-18 | 4 | -0/+43 |
|/ / | |||||
* | | Removed old text_helper apis for highlight, excerpt and word_wrap | Jeremy Walker | 2012-05-17 | 1 | -35/+3 |
| | | |||||
* | | Merge pull request #2036 from Bodacious/tag_helper_data_fix | Rafael Mendonça França | 2012-05-17 | 1 | -2/+3 |
|\ \ | | | | | | | TagHelper creates invalid data attributes when value is a BigDecimal | ||||
| * | | Fixed tag_helper data-attribute bug with BigDecimals | Bodacious | 2012-05-17 | 1 | -2/+3 |
| |/ | |||||
* | | Merge pull request #6309 from steveklabnik/fix-2394 | José Valim | 2012-05-17 | 3 | -1/+16 |
|\ \ | |/ |/| | Created a Raw handler for templates. | ||||
| * | Created a Raw handler for templates. | Steve Klabnik | 2012-05-17 | 3 | -1/+16 |
| | | | | | | | | Fixes #2394 | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-17 | 2 | -5/+7 |
|\ \ | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/core.rb | ||||
| * | | fix word_wrap eg output [ci skip] | Vijay Dev | 2012-05-17 | 1 | -1/+3 |
| | | | |||||
| * | | Fix code example for word_wrap helper. | Hendy Tanata | 2012-05-17 | 1 | -2/+2 |
| | | | |||||
| * | | Update action view context docs. | Oscar Del Ben | 2012-05-15 | 1 | -2/+2 |
| | | | |||||
* | | | Don't need to force size to nil | Rafael Mendonça França | 2012-05-16 | 4 | -10/+0 |
| | | | |||||
* | | | Document the usage of grouped_options_for_select with divider option | Rafael Mendonça França | 2012-05-16 | 1 | -1/+19 |
| | | | |||||
* | | | Make :prompt work as documented | Rafael Mendonça França | 2012-05-16 | 2 | -3/+9 |
| | | | |||||
* | | | Test deprecation and fix the documentation of grouped_options_for_select | Rafael Mendonça França | 2012-05-16 | 1 | -1/+4 |
| | | | |||||
* | | | Merge pull request #5369 from ↵ | Aaron Patterson | 2012-05-16 | 1 | -2/+17 |
|\ \ \ | | | | | | | | | | | | | | | | | Greenie0506/add_separator_to_grouped_options_for_select Add separator option to grouped_options_for_select | ||||
| * | | | Add separator argument to grouped_options_for_select | Greenie0506 | 2012-05-15 | 1 | -2/+17 |
| | | | | | | | | | | | | | | | | Change prompt to options hash in grouped_options_for_select |