aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* use unified and clean formatting in CHANGELOGS. [ci skip]Yves Senn2013-04-121-1/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-04-1136-78/+110
|\ | | | | | | | | Conflicts: guides/source/action_mailer_basics.md
| * improve accuracy of simple_format documentation. span doesn't get sanitized.RSL2013-04-091-2/+5
| |
| * Typo fixCarson McDonald2013-04-051-3/+3
| |
| * fix broken format in ActionView::Helpers::AssetTagHelper [ci skip]Francesco Rodriguez2013-04-041-4/+9
| |
| * mark ActionView::Helpers::Tags as :nodoc: [ci skip]Francesco Rodriguez2013-04-0433-68/+67
| |
| * fix broken format in ActionView::Helpers::NumberHelper [ci skip]Francesco Rodriguez2013-04-031-0/+25
| |
| * Fix typoCarson McDonald2013-03-311-1/+1
| |
* | Return nil for Mime::NullType#refAndrew White2013-04-102-1/+5
| |
* | Reverts rendering behavior when format is unknownGrzegorz Świrski2013-04-102-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 screenNikolay Shebanov2013-04-101-1/+1
| |
* | Fix typoRafael Mendonça França2013-04-091-2/+2
| |
* | Merge pull request #10148 from vipulnsward/traces_changeCarlos Antonio da Silva2013-04-091-6/+4
|\ \ | | | | | | change array of array to hash
| * | change array of array to hashVipul A M2013-04-091-6/+4
| | |
* | | fix AP warning; remove unused variableVipul A M2013-04-091-0/+1
|/ /
* | Mark unused variables and make some style fixesAgis Anastasopoulos2013-04-089-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_exceptionsRafael Mendonça França2013-04-082-1/+103
|\ \ | | | | | | Exceptions raised when using ActionController::Live cause server crash
| * | Exception handling for controllers using ActionController::LiveSean Griffin2013-03-182-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_builderRafael Mendonça França2013-04-081-2/+55
|\ \ \ | | | | | | | | | | | | | | | | Added documentation to the FormBuilder class Closes #10115
| * | | Added documentation to the FormBuilder class, should helpwangjohn2013-04-061-2/+55
| | | | | | | | | | | | | | | | | | | | clarify issue #10115. Also made the field_helpers an explicit list of methods.
* | | | Merge pull request #10130 from Agis-/patch-2Carlos Antonio da Silva2013-04-081-3/+3
|\ \ \ \ | | | | | | | | | | Mark unused block parameters.
| * | | | Remove unused block parametersAgis Anastasopoulos2013-04-071-3/+3
| |/ / /
* / / / Remove unecessary variable call, `#sort!` always returns an arrayAgis Anastasopoulos2013-04-071-1/+0
|/ / /
* | | Merge pull request #10101 from wangjohn/refactoring_routing_mapperAndrew White2013-04-061-12/+13
|\ \ \ | | | | | | | | Refactoring some reused code into a method (inside of the routes mapper)
| * | | Refactoring some reused code into a method (inside of the routeswangjohn2013-04-051-12/+13
| | | | | | | | | | | | | | | | mapper) and adding a constant for all the possible scopes.
* | | | change some more merge to merge! on new hashesVipul A M2013-04-061-3/+3
| | | |
* | | | Remove extra whitespaceAgis Anastasopoulos2013-04-061-4/+4
| | | |
* | | | Merge pull request #9555 from tmm1/optimize-erbRafael Mendonça França2013-04-052-3/+35
|\ \ \ \ | | | | | | | | | | Optimize generated ERB to reduce method calls
| * | | | avoid extra method calls for appending newlinesAman Gupta2013-03-041-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 templatesAman Gupta2013-03-042-3/+9
| | | | |
* | | | | Improve the changelog entry [ci skip]Rafael Mendonça França2013-04-051-3/+4
| | | | |
* | | | | Fix explicit names on multiple file fieldsRyan McGeary2013-04-053-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 spacesCarlos Antonio da Silva2013-04-051-15/+17
| | | |
* | | | Refactor mail_to to not generate intermediate hashes when adding hrefCarlos Antonio da Silva2013-04-041-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 hashCarlos Antonio da Silva2013-04-042-4/+10
| | | |
* | | | Merge pull request #10065 from spohlenz/mail_to_blockCarlos Antonio da Silva2013-04-043-5/+30
|\ \ \ \ | | | | | | | | | | Add block support for the mail_to helper
| * | | | Add block support for the helperSam Pohlenz2013-04-033-5/+30
| | | | |
* | | | | Fix typo in view nameCarlos Antonio da Silva2013-04-032-1/+1
| | | | | | | | | | | | | | | | | | | | Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428
* | | | | Merge pull request #10074 from ↵Rafael Mendonça França2013-04-034-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.1Trevor Turk2013-04-034-4/+0
| | | | | |
* | | | | | Merge pull request #9932 from senny/9913_routing_problemAndrew White2013-04-032-8/+41
|\ \ \ \ \ \ | | | | | | | | | | | | | | routing bugfixes when matching multiple paths
| * | | | | | routing shorthand syntax works with multiple pathsYves Senn2013-03-262-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9913. We need to expand the match shorthand syntax for every path.
| * | | | | | bugfix, when matching multiple paths with `get`, `post`, ...Yves Senn2013-03-262-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 Senn2013-04-032-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 messagethenickcox2013-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog entry Delete changelog
* | | | | | Getting rid of a few other vestiges of rails.png.Steve Klabnik2013-04-021-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-renameSantiago Pastorino2013-04-025-13/+13
|\ \ \ \ \ | | | | | | | | | | | | Rename DummyKeyGenerator -> LegacyKeyGenerator
| * | | | | Rename DummyKeyGenerator -> LegacyKeyGeneratorTrevor Turk2013-04-025-13/+13
| | | | | |
* | | | | | :scissors: spacing after privateTrevor Turk2013-04-021-3/+0
| | | | | |
* | | | | | Be consistent when talking about cookies, key -> nameTrevor Turk2013-04-021-25/+25
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 07:45:39 +0000