aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #6384 from ihid/tidy_text_helpersJeremy Kemper2012-05-182-14/+62
|\ \ \ \ | | | | | | | | | | Tidied and standardised text_helper implementations.
| * | | | Tidied and standardised text_helper implementations.Jeremy Walker2012-05-192-14/+62
| | | | |
* | | | | Fix inspecting route redirections, closes #6369Łukasz Strzałkowski2012-05-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes route inspection in `rake routes` Before: foo /foo(.:format) :controller#:action" After: foo /foo(.:format) Redirect (301)
* | | | | Fix build: can't convert Regexp to Stringkennyj2012-05-191-1/+1
| | | | |
* | | | | reverting decoupling of NumberHelper from safe_join and adding tests for ↵Andrew Mutz2012-05-182-1/+3
|/ / / / | | | | | | | | | | | | escaping of delimiters and separators
* | | | Merge pull request #6372 from richo/bugs/middleware_stack_as_arrayJosé Valim2012-05-172-2/+12
|\ \ \ \ | | | | | | | | | | Add some common Array methods to the middleware stack
| * | | | Add the #unshift method to the middleware stackRich Healey2012-05-182-2/+12
| | |_|/ | |/| | | | | | | | | | | | | | | | | | The docs suggest that the middleware stack is an Array, so I've added the unshift method to it. Originally I added some more Array methods, but it was agreed that they lacked usecases.
* | | | Merge pull request #5020 from KL-7/fix-blank-image_tag-sourceJosé Valim2012-05-172-2/+3
|\ \ \ \ | | | | | | | | | | 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-182-2/+3
| |/ / /
* / / / Add HTML5 input[type="time"] helperAlex Soulim2012-05-187-0/+76
|/ / /
* | | Removed old text_helper apis for highlight, excerpt and word_wrapJeremy Walker2012-05-173-69/+27
| | |
* | | 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-172-4/+5
|\ \ \ | | | | | | | | TagHelper creates invalid data attributes when value is a BigDecimal
| * | | Fixed tag_helper data-attribute bug with BigDecimalsBodacious2012-05-172-4/+5
| |/ /
* | | MiniTest deprecated #assert_block in favor of calling #assert with a blockJeremy Kemper2012-05-171-1/+1
| | |
* | | Update actionpack/CHANGELOG.mdJosé Valim2012-05-171-0/+3
| | |
* | | Merge pull request #6309 from steveklabnik/fix-2394José Valim2012-05-179-6/+36
|\ \ \ | |/ / |/| | Created a Raw handler for templates.
| * | Created a Raw handler for templates.Steve Klabnik2012-05-179-6/+36
| | | | | | | | | | | | 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-163-3/+16
| | | |
* | | | Test deprecation and fix the documentation of grouped_options_for_selectRafael Mendonça França2012-05-162-3/+6
| | | |
* | | | 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-162-4/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-152-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | 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-152-9/+27
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Feature/simple format refactoring
| * | | | | Added the wrapper tag option to simple_formatAvi Tzurel2012-05-142-2/+12
| | | | | |
| * | | | | 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-155-55/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-155-11/+55
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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-154-3/+55
| | | | |
* | | | | 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-145-55/+11
| |/ / / |/| | | | | | | | | | | `submit_tag`, `button_tag` and `button_to` helpers.
* | | | Remove `:mouseover` option from `image_tag` helper.Rafael Mendonça França2012-05-133-21/+3
| | | |
* | | | Merge pull request #3237 from sakuro/data-url-schemeRafael Mendonça França2012-05-133-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-132-3/+10
| | | | |
* | | | | Only set `:include_blank` if the value of this options is not presentRafael Mendonça França2012-05-132-1/+7
| | | | |
* | | | | `:include_blank` should be true if the size option is nilRafael Mendonça França2012-05-133-17/+25
| | | | |