Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Add url generation tests for #10185 | Andrew White | 2013-04-18 | 1 | -0/+2 | |
| | | | ||||||
* | | | Duplicate options before mutating them | Andrew White | 2013-04-18 | 2 | -3/+5 | |
| | | | ||||||
* | | | Passing subdomain: '' to url_for removes the subdomain (instead of adding a ↵ | Derek Watson | 2013-04-18 | 4 | -1/+32 | |
| | | | | | | | | | | | | | | | | | | leading .) Adding a boolean route constraint checks for presence/absence of request property | |||||
* | | | Avoid leak into controller's action_methods | printercu | 2013-04-18 | 2 | -0/+7 | |
| | | | ||||||
* | | | Merge pull request #10173 from nashby/element-attributes | Rafael Mendonça França | 2013-04-16 | 3 | -1/+13 | |
|\ \ \ | | | | | | | | | options_from_collection_for_select helper takes html attributes | |||||
| * | | | options_from_collection_for_select helper takes html attributes | Vasiliy Ermolovich | 2013-04-11 | 3 | -1/+13 | |
| | | | | | | | | | | | | | | | | as the last element of the array | |||||
* | | | | replace match with get verb in ActionController::Metal | Gaurish Sharma | 2013-04-16 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | make [] method in router more readable | buddhamagnet | 2013-04-15 | 1 | -1/+3 | |
| |_|/ |/| | | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-04-13 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Fix a typo | Viktar Basharymau | 2013-04-12 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | use unified and clean formatting in CHANGELOGS. [ci skip] | Yves Senn | 2013-04-12 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-04-11 | 36 | -78/+110 | |
|\ \ \ | |/ / |/| | | | | | | | | Conflicts: guides/source/action_mailer_basics.md | |||||
| * | | improve accuracy of simple_format documentation. span doesn't get sanitized. | RSL | 2013-04-09 | 1 | -2/+5 | |
| | | | ||||||
| * | | Typo fix | Carson McDonald | 2013-04-05 | 1 | -3/+3 | |
| | | | ||||||
| * | | fix broken format in ActionView::Helpers::AssetTagHelper [ci skip] | Francesco Rodriguez | 2013-04-04 | 1 | -4/+9 | |
| | | | ||||||
| * | | mark ActionView::Helpers::Tags as :nodoc: [ci skip] | Francesco Rodriguez | 2013-04-04 | 33 | -68/+67 | |
| | | | ||||||
| * | | fix broken format in ActionView::Helpers::NumberHelper [ci skip] | Francesco Rodriguez | 2013-04-03 | 1 | -0/+25 | |
| | | | ||||||
| * | | Fix typo | Carson McDonald | 2013-03-31 | 1 | -1/+1 | |
| | | | ||||||
* | | | Return nil for Mime::NullType#ref | Andrew White | 2013-04-10 | 2 | -1/+5 | |
| | | | ||||||
* | | | Reverts rendering behavior when format is unknown | Grzegorz Świrski | 2013-04-10 | 2 | -2/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If a request has unknown format (eg. /foo.bar), the renderer fallbacks to default format. This patch reverts Rails 3.2 behavior after c2267db commit. Fixes issue #9654. | |||||
* | | | Use camelize instead of capitalize on error screen | Nikolay Shebanov | 2013-04-10 | 1 | -1/+1 | |
| | | | ||||||
* | | | Fix typo | Rafael Mendonça França | 2013-04-09 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge pull request #10148 from vipulnsward/traces_change | Carlos Antonio da Silva | 2013-04-09 | 1 | -6/+4 | |
|\ \ \ | | | | | | | | | change array of array to hash | |||||
| * | | | change array of array to hash | Vipul A M | 2013-04-09 | 1 | -6/+4 | |
| | | | | ||||||
* | | | | fix AP warning; remove unused variable | Vipul A M | 2013-04-09 | 1 | -0/+1 | |
|/ / / | ||||||
* | | | Mark unused variables and make some style fixes | Agis Anastasopoulos | 2013-04-08 | 9 | -13/+13 | |
| | | | | | | | | | | | | It'd be a nice convention to mark the unused variables like this, now that Ruby 2 will issue no warnings for such vars being unused. | |||||
* | | | Merge pull request #9604 from sgrif/live_streaming_exceptions | Rafael Mendonça França | 2013-04-08 | 2 | -1/+103 | |
|\ \ \ | | | | | | | | | Exceptions raised when using ActionController::Live cause server crash | |||||
| * | | | Exception handling for controllers using ActionController::Live | Sean Griffin | 2013-03-18 | 2 | -1/+103 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any exceptions that occured at the view or controller level for a controller using ActionController::Live would cause the server to either hang with an open socket indefinitely, or immediately crash (depending on whether the server was launched with rails s or directly). Changed the behavior of exceptions to act the same as streaming templates for html requests, and allow for an on_error callback if needed. | |||||
* | | | | Merge pull request #10122 from wangjohn/adding_documentation_to_form_builder | Rafael Mendonça França | 2013-04-08 | 1 | -2/+55 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added documentation to the FormBuilder class Closes #10115 | |||||
| * | | | | Added documentation to the FormBuilder class, should help | wangjohn | 2013-04-06 | 1 | -2/+55 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | clarify issue #10115. Also made the field_helpers an explicit list of methods. | |||||
* | | | | | Merge pull request #10130 from Agis-/patch-2 | Carlos Antonio da Silva | 2013-04-08 | 1 | -3/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | Mark unused block parameters. | |||||
| * | | | | | Remove unused block parameters | Agis Anastasopoulos | 2013-04-07 | 1 | -3/+3 | |
| |/ / / / | ||||||
* / / / / | Remove unecessary variable call, `#sort!` always returns an array | Agis Anastasopoulos | 2013-04-07 | 1 | -1/+0 | |
|/ / / / | ||||||
* | | | | Merge pull request #10101 from wangjohn/refactoring_routing_mapper | Andrew White | 2013-04-06 | 1 | -12/+13 | |
|\ \ \ \ | | | | | | | | | | | Refactoring some reused code into a method (inside of the routes mapper) | |||||
| * | | | | Refactoring some reused code into a method (inside of the routes | wangjohn | 2013-04-05 | 1 | -12/+13 | |
| | | | | | | | | | | | | | | | | | | | | mapper) and adding a constant for all the possible scopes. | |||||
* | | | | | change some more merge to merge! on new hashes | Vipul A M | 2013-04-06 | 1 | -3/+3 | |
| | | | | | ||||||
* | | | | | Remove extra whitespace | Agis Anastasopoulos | 2013-04-06 | 1 | -4/+4 | |
| | | | | | ||||||
* | | | | | Merge pull request #9555 from tmm1/optimize-erb | Rafael Mendonça França | 2013-04-05 | 2 | -3/+35 | |
|\ \ \ \ \ | | | | | | | | | | | | | Optimize generated ERB to reduce method calls | |||||
| * | | | | | avoid extra method calls for appending newlines | Aman Gupta | 2013-03-04 | 1 | -1/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before: ');@output_buffer.append= ( content_icon row[:content] );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' ');@output_buffer.append= ( spinner_img );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' </td> <td class="content"> ');@output_buffer.append= ( content_link row[:content] );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' </td> <td class="message"> '); after: ';@output_buffer.append=( content_icon row[:content] );@output_buffer.safe_append=' ';@output_buffer.append=( spinner_img );@output_buffer.safe_append=' </td> <td class="content"> ';@output_buffer.append=( content_link row[:content] );@output_buffer.safe_append=' </td> <td class="message"> '; | |||||
| * | | | | | Use ActionView::OutputBuffer#safe_append= from templates | Aman Gupta | 2013-03-04 | 2 | -3/+9 | |
| | | | | | | ||||||
* | | | | | | Improve the changelog entry [ci skip] | Rafael Mendonça França | 2013-04-05 | 1 | -3/+4 | |
| | | | | | | ||||||
* | | | | | | Fix explicit names on multiple file fields | Ryan McGeary | 2013-04-05 | 3 | -8/+24 | |
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a file field tag is passed the multiple option, it is turned into an array field (appending "[]"), but if the file field is passed an explicit name as an option, leave the name alone (do not append "[]"). Fixes #9830 | |||||
* | | | | | Fix indent and remove extra white spaces | Carlos Antonio da Silva | 2013-04-05 | 1 | -15/+17 | |
| | | | | | ||||||
* | | | | | Refactor mail_to to not generate intermediate hashes when adding href | Carlos Antonio da Silva | 2013-04-04 | 1 | -5/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to use Hash#merge with a new hash just for setting the href option to pass it through. Since we're always dealing with a new html_options hash, we're free to just set the value instead. | |||||
* | | | | | Ensure mail_to helper does not modify the given html options hash | Carlos Antonio da Silva | 2013-04-04 | 2 | -4/+10 | |
| | | | | | ||||||
* | | | | | Merge pull request #10065 from spohlenz/mail_to_block | Carlos Antonio da Silva | 2013-04-04 | 3 | -5/+30 | |
|\ \ \ \ \ | | | | | | | | | | | | | Add block support for the mail_to helper | |||||
| * | | | | | Add block support for the helper | Sam Pohlenz | 2013-04-03 | 3 | -5/+30 | |
| | | | | | | ||||||
* | | | | | | Fix typo in view name | Carlos Antonio da Silva | 2013-04-03 | 2 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428 | |||||
* | | | | | | Merge pull request #10074 from ↵ | Rafael Mendonça França | 2013-04-03 | 4 | -4/+0 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trevorturk/remove-fixme-comments-about-legacy-key-generator Remove comments about removing LegacyKeyGenerator in 4.1 | |||||
| * | | | | | | Remove comments about removing LegacyKeyGenerator in 4.1 | Trevor Turk | 2013-04-03 | 4 | -4/+0 | |
| | | | | | | |