Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | options_from_collection_for_select helper takes html attributes | Vasiliy Ermolovich | 2013-04-11 | 3 | -1/+13 |
| | | | | as the last element of the array | ||||
* | 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 |
| | | | | | |||||
* | | | | | Merge pull request #9932 from senny/9913_routing_problem | Andrew White | 2013-04-03 | 2 | -8/+41 |
|\ \ \ \ \ | | | | | | | | | | | | | routing bugfixes when matching multiple paths | ||||
| * | | | | | routing shorthand syntax works with multiple paths | Yves Senn | 2013-03-26 | 2 | -5/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9913. We need to expand the match shorthand syntax for every path. | ||||
| * | | | | | bugfix, when matching multiple paths with `get`, `post`, ... | Yves Senn | 2013-03-26 | 2 | -3/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This problem was introduced with: https://github.com/rails/rails/commit/d03aa104e069be4e301efa8cefb90a2a785a7bff | ||||
* | | | | | | fix regression in Mapper when `format:` was used in a `scope`. | Yves Senn | 2013-04-03 | 2 | -1/+23 |
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #10071 `#normalize_path!` depends on the options so we need to call `#normalize_options!` first to make sure everything is set correctly. | ||||
* | | | | | Fix grammatical error on JS helper warning message | thenickcox | 2013-04-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog entry Delete changelog | ||||
* | | | | | Getting rid of a few other vestiges of rails.png. | Steve Klabnik | 2013-04-02 | 1 | -0/+0 |
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't actually need a rails.png in the AP fixtures, the tests that use it don't actually try to load the file. We also don't need to get rid of it with the dummy reset either. Finally, it's not needed in the sample application that's included with the Rails Guides. | ||||
* | | | | Merge pull request #10061 from trevorturk/dummy-key-generator-rename | Santiago Pastorino | 2013-04-02 | 5 | -13/+13 |
|\ \ \ \ | | | | | | | | | | | Rename DummyKeyGenerator -> LegacyKeyGenerator | ||||
| * | | | | Rename DummyKeyGenerator -> LegacyKeyGenerator | Trevor Turk | 2013-04-02 | 5 | -13/+13 |
| | | | | | |||||
* | | | | | :scissors: spacing after private | Trevor Turk | 2013-04-02 | 1 | -3/+0 |
| | | | | | |||||
* | | | | | Be consistent when talking about cookies, key -> name | Trevor Turk | 2013-04-02 | 1 | -25/+25 |
| | | | | | |||||
* | | | | | Fix permanent cookie jar accessor typo | Trevor Turk | 2013-04-02 | 2 | -2/+7 |
|/ / / / | |||||
* | | | | Merge pull request #10054 from rubys/use_find_by_in_rdoc | Santiago Pastorino | 2013-04-02 | 3 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Prefer find_by over dynamic finders in rdoc | ||||
| * | | | | Prefer find_by over dynamic finders in rdoc | Sam Ruby | 2013-04-02 | 3 | -4/+4 |
| | | | | | |||||
* | | | | | each_with_index => each as we dont use index | Vipul A M | 2013-04-03 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Fixed typo on AP dispatch Mime::Type test | KalabiYau | 2013-04-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | Improve documentation around the cookie store auto-upgrade to encryption | Trevor Turk | 2013-04-01 | 1 | -22/+37 |
| | | | | |||||
* | | | | Merge pull request #9978 from trevorturk/cookie-store-auto-upgrade | Santiago Pastorino | 2013-04-01 | 5 | -78/+162 |
|\ \ \ \ | | | | | | | | | | | Cookie-base session store auto-upgrade |