Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | 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 | 3 | -16/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | | | | Improve `rake routes` output for redirects - closes #6369. | Andrew White | 2012-05-19 | 1 | -12/+22 | |
| |/ / / |/| | | | ||||||
* | | | | Merge pull request #6384 from ihid/tidy_text_helpers | Jeremy Kemper | 2012-05-18 | 2 | -14/+62 | |
|\ \ \ \ | | | | | | | | | | | Tidied and standardised text_helper implementations. | |||||
| * | | | | Tidied and standardised text_helper implementations. | Jeremy Walker | 2012-05-19 | 2 | -14/+62 | |
| | | | | | ||||||
* | | | | | Fix inspecting route redirections, closes #6369 | Łukasz Strzałkowski | 2012-05-18 | 1 | -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 String | kennyj | 2012-05-19 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | reverting decoupling of NumberHelper from safe_join and adding tests for ↵ | Andrew Mutz | 2012-05-18 | 2 | -1/+3 | |
|/ / / / | | | | | | | | | | | | | escaping of delimiters and separators | |||||
* | | | | Merge pull request #6372 from richo/bugs/middleware_stack_as_array | José Valim | 2012-05-17 | 2 | -2/+12 | |
|\ \ \ \ | | | | | | | | | | | Add some common Array methods to the middleware stack | |||||
| * | | | | Add the #unshift method to the middleware stack | Rich Healey | 2012-05-18 | 2 | -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-source | José Valim | 2012-05-17 | 2 | -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 Lashuk | 2012-05-18 | 2 | -2/+3 | |
| |/ / / | ||||||
* / / / | Add HTML5 input[type="time"] helper | Alex Soulim | 2012-05-18 | 7 | -0/+76 | |
|/ / / | ||||||
* | | | Removed old text_helper apis for highlight, excerpt and word_wrap | Jeremy Walker | 2012-05-17 | 3 | -69/+27 | |
| | | | ||||||
* | | | Fix incorrect assert_block -> assert conversion. Assumed too much from the ↵ | Jeremy Kemper | 2012-05-17 | 1 | -2/+2 | |
| | | | | | | | | | | | | MiniTest deprecation message. | |||||
* | | | Merge pull request #2036 from Bodacious/tag_helper_data_fix | Rafael Mendonça França | 2012-05-17 | 2 | -4/+5 | |
|\ \ \ | | | | | | | | | TagHelper creates invalid data attributes when value is a BigDecimal | |||||
| * | | | Fixed tag_helper data-attribute bug with BigDecimals | Bodacious | 2012-05-17 | 2 | -4/+5 | |
| |/ / | ||||||
* | | | MiniTest deprecated #assert_block in favor of calling #assert with a block | Jeremy Kemper | 2012-05-17 | 1 | -1/+1 | |
| | | | ||||||
* | | | Update actionpack/CHANGELOG.md | José Valim | 2012-05-17 | 1 | -0/+3 | |
| | | | ||||||
* | | | Merge pull request #6309 from steveklabnik/fix-2394 | José Valim | 2012-05-17 | 9 | -6/+36 | |
|\ \ \ | |/ / |/| | | Created a Raw handler for templates. | |||||
| * | | Created a Raw handler for templates. | Steve Klabnik | 2012-05-17 | 9 | -6/+36 | |
| | | | | | | | | | | | | 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 | 3 | -3/+16 | |
| | | | | ||||||
* | | | | Test deprecation and fix the documentation of grouped_options_for_select | Rafael Mendonça França | 2012-05-16 | 2 | -3/+6 | |
| | | | | ||||||
* | | | | Merge pull request #2237 from jackdempsey/log_redirect_to | Aaron Patterson | 2012-05-16 | 1 | -0/+1 | |
|\ \ \ \ | | | | | | | | | | | log at debug level what line caused the redirect_to | |||||
| * | | | | log at debug level what line caused the redirect_to | Jack Dempsey | 2012-05-16 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #5369 from ↵ | Aaron Patterson | 2012-05-16 | 2 | -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_select | Greenie0506 | 2012-05-15 | 2 | -4/+44 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Change prompt to options hash in grouped_options_for_select | |||||
* | | | | | | Merge pull request #6273 from KensoDev/feature/simple_format_refactoring | Rafael Mendonça França | 2012-05-15 | 2 | -9/+27 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Feature/simple format refactoring | |||||
| * | | | | | Added the wrapper tag option to simple_format | Avi Tzurel | 2012-05-14 | 2 | -2/+12 | |
| | | | | | | ||||||
| * | | | | | simple_format refactoring | Avi Tzurel | 2012-05-14 | 1 | -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é Valim | 2012-05-15 | 5 | -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é Valim | 2012-05-15 | 5 | -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/docrails | Vijay Dev | 2012-05-15 | 32 | -152/+23 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb | |||||
| * | | | | Removing ==Examples and last blank lines of docs from actionpack | Francesco Rodriguez | 2012-05-15 | 32 | -183/+56 | |
| | | | | | ||||||
| * | | | | mispelling asset_tag_helper | Angelo Capilleri | 2012-05-13 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | add tests and external file backtrace for Routing::Mapper#draw | Kornelius Kalnbach | 2012-05-15 | 4 | -3/+55 | |
| | | | | | ||||||
* | | | | | Use merge! instead reverse_merge! here | Santiago Pastorino | 2012-05-14 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Remove `:disable_with` in favor of `'data-disable-with'` option from ↵ | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 5 | -55/+11 | |
| |/ / / |/| | | | | | | | | | | | `submit_tag`, `button_tag` and `button_to` helpers. | |||||
* | | | | Remove `:mouseover` option from `image_tag` helper. | Rafael Mendonça França | 2012-05-13 | 3 | -21/+3 | |
| | | | | ||||||
* | | | | Merge pull request #3237 from sakuro/data-url-scheme | Rafael Mendonça França | 2012-05-13 | 3 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support data: url scheme Conflicts: actionpack/lib/action_view/asset_paths.rb | |||||
* | | | | Remove dependency on safe_join from number helpers | Carlos Antonio da Silva | 2012-05-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Introduced in 0f848dd54911f0e15c5c3aceabf09582cc6eab16. | |||||
* | | | | Autoload ActionDispatch::Request::Session to avoid circular require. | Andrew White | 2012-05-13 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | Merge pull request #6293 from carlosantoniodasilva/render-partial-refactor | José Valim | 2012-05-13 | 2 | -38/+37 | |
|\ \ \ \ | | | | | | | | | | | Improve and cleanup a bit partial renderer |