aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Removed old text_helper apis for highlight, excerpt and word_wrapJeremy Walker2012-05-171-35/+3
|
* Fix incorrect assert_block -> assert conversion. Assumed too much from the ↵Jeremy Kemper2012-05-171-2/+2
| | | | MiniTest deprecation message.
* 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
| |
* | MiniTest deprecated #assert_block in favor of calling #assert with a blockJeremy Kemper2012-05-171-1/+1
| |
* | 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 #2237 from jackdempsey/log_redirect_toAaron Patterson2012-05-161-0/+1
|\ \ \ | | | | | | | | log at debug level what line caused the redirect_to
| * | | log at debug level what line caused the redirect_toJack Dempsey2012-05-161-0/+1
| | | |
* | | | 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-1532-152/+23
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
| * | | Removing ==Examples and last blank lines of docs from actionpackFrancesco Rodriguez2012-05-1532-183/+56
| | | |
| * | | mispelling asset_tag_helperAngelo Capilleri2012-05-131-1/+1
| | | |
* | | | add tests and external file backtrace for Routing::Mapper#drawKornelius Kalnbach2012-05-151-3/+4
| | | |
* | | | Use merge! instead reverse_merge! hereSantiago Pastorino2012-05-141-1/+1
| | | |
* | | | Remove `:disable_with` in favor of `'data-disable-with'` option from ↵Carlos Galdino + Rafael Mendonça França2012-05-142-25/+5
| |/ / |/| | | | | | | | `submit_tag`, `button_tag` and `button_to` helpers.
* | | Remove `:mouseover` option from `image_tag` helper.Rafael Mendonça França2012-05-131-12/+0
| | |
* | | Merge pull request #3237 from sakuro/data-url-schemeRafael Mendonça França2012-05-132-2/+2
| | | | | | | | | | | | | | | | | | | | | Support data: url scheme Conflicts: actionpack/lib/action_view/asset_paths.rb
* | | Remove dependency on safe_join from number helpersCarlos Antonio da Silva2012-05-131-1/+1
| | | | | | | | | | | | Introduced in 0f848dd54911f0e15c5c3aceabf09582cc6eab16.
* | | Autoload ActionDispatch::Request::Session to avoid circular require.Andrew White2012-05-131-1/+2
| | |
* | | Merge pull request #6293 from carlosantoniodasilva/render-partial-refactorJosé Valim2012-05-132-38/+37
|\ \ \ | | | | | | | | Improve and cleanup a bit partial renderer
| * | | Improve and cleanup a bit partial rendererCarlos Antonio da Silva2012-05-122-38/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove template assignment: there is no need for this assignment, given we are rendering a collection with possibly different templates, and a second call to render (with the same instance) would behave differently if the template is set. * Remove segments array in favor of Array#map * Use local vars whenever possible * Cache local template keys, remove defaults from find_template
* | | | Do not add `:include_blank` option if prompt is presentRafael Mendonça França2012-05-131-3/+3
| | | |
* | | | Only set `:include_blank` if the value of this options is not presentRafael Mendonça França2012-05-131-1/+1
| | | |
* | | | `:include_blank` should be true if the size option is nilRafael Mendonça França2012-05-131-2/+2
| | | |
* | | | Merge pull request #6225 from ↵Rafael Mendonça França2012-05-131-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acapilleri/select_with_required_true_include_first_option_blank HTML5 validation error with options_from_collection_for_select Fixes #5908 Conflicts: actionpack/CHANGELOG.md
| * | | | Always include the options :include_blank if the select has a required attributeangelo giovanni capilleri2012-05-131-0/+5
| | | | | | | | | | | | | | | | | | | | and display size 1 and not multiple attribute, Fixes #5908
* | | | | Merge pull request #6171 from oscardelben/move_token_tag_if_blockRafael Mendonça França2012-05-121-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Switch token_tag if block
| * | | | Switch token_tag if blockOscar Del Ben2012-05-051-3/+3
| | | | |
* | | | | update example outputs of some asset helpersVijay Dev2012-05-121-18/+18
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Changed /images and /fonts to /assets in the examples of image_path, image_tag and font_path helpers [ci skip]
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-121-42/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb
| * | | | Move HTTP Token auth docs above the Token moduleElia Schito2012-05-111-42/+44
| | | | |
* | | | | Revert "Merge pull request #6142 from spartan-developer/master"José Valim2012-05-124-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 667d0bdd90ef6e6b691f0cc4cf5535b8da69f248, reversing changes made to 4ae6bab6bb02c9390188a49f9a749400f6a0ac94.
* | | | | Merge pull request #6142 from spartan-developer/masterJosé Valim2012-05-124-12/+10
|\ \ \ \ \ | | | | | | | | | | | | refactored extracting :size => 'XxY' into an extract_size! method
| * | | | | refactored extracting :size => 'XxY' into an extract_size! methodNicholas Yianilos2012-05-034-12/+10
| | | | | |
* | | | | | Remove useless load path modificationsSantiago Pastorino2012-05-112-9/+0
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-29 14:34:58 +0000