aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-231-1/+1
|\
| * Revert "Remove blank trailing comments"Vijay Dev2012-05-2313-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 Morton2012-05-221-1/+1
| | | | | | | | anything.
| * Remove blank trailing commentsHenrik Hodne2012-05-2013-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 helpersCarlos Galdino2012-05-226-50/+26
| |
* | Merge pull request #6359 from carlosgaldino/add-html5-inputsJeremy Kemper2012-05-228-0/+248
|\ \ | | | | | | Add HTML5 color and date/time inputs
| * | Add several HTML5 input helpersCarlos Galdino2012-05-217-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"] helperCarlos Galdino2012-05-214-0/+43
| | |
* | | Fixed typo new_defautls -> new_defaults.Philip Arndt2012-05-231-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é Valim2012-05-211-68/+19
| | | | | | | | | | | | | | | This reverts commit 254c04286c5916ae7f91eb6e173b312e7a74e364, reversing changes made to 513a0525c24c2944630acfa465b22cd2f4601adf.
* | | Merge pull request #6425 from pinetops/resolver_concurrency_fixAaron Patterson2012-05-211-19/+68
|\ \ \ | |/ / |/| | Resolver concurrency fix
| * | More granular locking of the Resolver template cacheTom Clarke2012-05-211-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 #6404Tom Clarke2012-05-211-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/565c1b0a0772ac6cf91c77e9285806f7b028614cJosé Valim2012-05-201-10/+22
| | | | | | | | | | | | | | | | | | | | | Template concurrency fixes Conflicts: actionpack/lib/action_view/template.rb
* | | fix closing tag [ci skip]Vijay Dev2012-05-201-1/+1
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-191-1/+4
|\ \
| * | minor fix wrapper tag documentationFrancesco Rodriguez2012-05-181-1/+1
| | |
| * | Minor fix to the wrapper tag documentation, the options hash is the last ↵Avi Tzurel2012-05-191-1/+1
| | | | | | | | | | | | one, added blank hash before that in the args list
| * | Added wrapper tag documentation to the simple_format methodAvi Tzurel2012-05-191-1/+4
| | |
* | | Clarify grouped_options_for_select method API, add changelog entryCarlos Antonio da Silva2012-05-191-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_helpersJeremy Kemper2012-05-181-14/+20
|\ \ \ | | | | | | | | Tidied and standardised text_helper implementations.
| * | | Tidied and standardised text_helper implementations.Jeremy Walker2012-05-191-14/+20
| | | |
* | | | reverting decoupling of NumberHelper from safe_join and adding tests for ↵Andrew Mutz2012-05-181-1/+1
|/ / / | | | | | | | | | escaping of delimiters and separators
* | | Merge pull request #5020 from KL-7/fix-blank-image_tag-sourceJosé Valim2012-05-171-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 Lashuk2012-05-181-2/+2
| | |/ | |/|
* / | Add HTML5 input[type="time"] helperAlex Soulim2012-05-184-0/+43
|/ /
* | Removed old text_helper apis for highlight, excerpt and word_wrapJeremy Walker2012-05-171-35/+3
| |
* | Merge pull request #2036 from Bodacious/tag_helper_data_fixRafael Mendonça França2012-05-171-2/+3
|\ \ | | | | | | TagHelper creates invalid data attributes when value is a BigDecimal
| * | Fixed tag_helper data-attribute bug with BigDecimalsBodacious2012-05-171-2/+3
| |/
* | Merge pull request #6309 from steveklabnik/fix-2394José Valim2012-05-173-1/+16
|\ \ | |/ |/| Created a Raw handler for templates.
| * Created a Raw handler for templates.Steve Klabnik2012-05-173-1/+16
| | | | | | | | Fixes #2394
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-172-5/+7
|\ \ | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/core.rb
| * | fix word_wrap eg output [ci skip]Vijay Dev2012-05-171-1/+3
| | |
| * | Fix code example for word_wrap helper.Hendy Tanata2012-05-171-2/+2
| | |
| * | Update action view context docs.Oscar Del Ben2012-05-151-2/+2
| | |
* | | Don't need to force size to nilRafael Mendonça França2012-05-164-10/+0
| | |
* | | Document the usage of grouped_options_for_select with divider optionRafael Mendonça França2012-05-161-1/+19
| | |
* | | Make :prompt work as documentedRafael Mendonça França2012-05-162-3/+9
| | |
* | | Test deprecation and fix the documentation of grouped_options_for_selectRafael Mendonça França2012-05-161-1/+4
| | |
* | | Merge pull request #5369 from ↵Aaron Patterson2012-05-161-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_selectGreenie05062012-05-151-2/+17
| | | | | | | | | | | | | | | | Change prompt to options hash in grouped_options_for_select
* | | | Merge pull request #6273 from KensoDev/feature/simple_format_refactoringRafael Mendonça França2012-05-151-9/+19
|\ \ \ \ | |/ / / |/| | | Feature/simple format refactoring
| * | | Added the wrapper tag option to simple_formatAvi Tzurel2012-05-141-2/+4
| | | |
| * | | simple_format refactoringAvi Tzurel2012-05-141-9/+17
| | |/ | |/| | | | | | | | | | using split_paragraphs method and content_tag instead of string concatination
* | | Revert "Revert "Remove `:disable_with` in favor of `'data-disable-with'` ↵José Valim2012-05-152-25/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | option from `submit_tag`, `button_tag` and `button_to` helpers."" Finally remove `:disable_with` but use `:data => { :disable_with => ... }` in examples to show off a better API (which looks nicer in Ruby 1.9) This reverts commit a5c38a9c087e33d36397afc496be7c8e01b37ef0.
* | | Revert "Remove `:disable_with` in favor of `'data-disable-with'` option from ↵José Valim2012-05-152-5/+25
| |/ |/| | | | | | | | | | | | | | | | | `submit_tag`, `button_tag` and `button_to` helpers." `disable_with:` is much easier to type than `"data-disable-with" =>`, and the fact it uses "data-disable-with" => is an implementation concern, it should not affect the public API. This reverts commit 683fc4db00f496e5225928afb4d4e932e0fcdc48.
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-1512-76/+9
|\ \ | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
| * | Removing ==Examples and last blank lines of docs from actionpackFrancesco Rodriguez2012-05-1512-107/+42
| | |
| * | mispelling asset_tag_helperAngelo Capilleri2012-05-131-1/+1
| | |
* | | Use merge! instead reverse_merge! hereSantiago Pastorino2012-05-141-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 18:22:41 +0000