Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5783 from rafaelfranca/default_url_options | Santiago Pastorino | 2012-04-08 | 2 | -2/+2 |
|\ | | | | | Document that default_url_options must return a hash with symbolized keys | ||||
| * | default_url_options does not receive one argument anymore | Rafael Mendonça França | 2012-04-08 | 2 | -2/+2 |
| | | |||||
* | | Revert "Merge pull request #5750 from ahoward/master" | Santiago Pastorino | 2012-04-08 | 2 | -28/+1 |
|/ | | | | | | | This reverts commit 174cf8b22064c3999dfa685014d5b31ac993bb54, reversing changes made to 7ecd6a731bd60665bc6de94095137f0b2c4ada2a. The reverted commit improved the performance in the wrong place, now we have added this 6ddbd1844a6fd6aca2992f5f75c9f605cf89808f improvement. | ||||
* | Merge pull request #5748 from ai/no_type_in_html5 | Jeremy Kemper | 2012-04-08 | 13 | -168/+168 |
|\ | | | | | Remove unnecessary in HTML 5 type attribute with default value | ||||
| * | Remove unnecessary in HTML 5 type attribute with default value | Andrey A.I. Sitnik | 2012-04-05 | 13 | -168/+168 |
| | | |||||
* | | Merge pull request #5772 from lest/patch-4 | Xavier Noria | 2012-04-07 | 1 | -6/+4 |
|\ \ | | | | | | | use extract_options! in cycle helper | ||||
| * | | use extract_options! in cycle helper | Sergey Nartimov | 2012-04-07 | 1 | -6/+4 |
| | | | |||||
* | | | avoid empty api pages | Vijay Dev | 2012-04-08 | 3 | -4/+7 |
|/ / | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-07 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix example action dispatch in mime type | Alexey Vakhov | 2012-04-07 | 1 | -1/+1 |
| | | | |||||
* | | | pass default value as argument to fetch | Sergey Nartimov | 2012-04-06 | 1 | -1/+1 |
| | | | |||||
* | | | documents the contract for the argument of AD::Routing::RouteSet#url_for | Xavier Noria | 2012-04-05 | 1 | -0/+1 |
| | | | |||||
* | | | Make url_for work when option is nil and default_url_options has | Rafael Mendonça França | 2012-04-05 | 2 | -1/+10 |
| | | | | | | | | | | | | stringified keys | ||||
* | | | Fix url_for when options is nil | Rafael Mendonça França | 2012-04-05 | 1 | -1/+1 |
|/ / | | | | | | | | | RouteSet#url_for was modifying the options hash that belong to the caller | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-05 | 1 | -0/+1 |
|\ \ | |||||
| * | | Add AC record identifier example with not-persisted object | Alexey Vakhov | 2012-04-05 | 1 | -0/+1 |
| | | | |||||
| * | | Revert "update ActionPack README links" | Vijay Dev | 2012-04-05 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | This reverts commit aeb228c5be5e8a1e7d79ccaef3833f8f35b00046. Reason: The links are meant to be consumed in the api and not on GitHub. | ||||
| * | | update ActionPack README links | Hrvoje Šimić | 2012-04-05 | 1 | -10/+10 |
| | | | |||||
| * | | Revert "update ActionPack README links" | Vijay Dev | 2012-04-04 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | This reverts commit aeb228c5be5e8a1e7d79ccaef3833f8f35b00046. Reason: The links are meant to be consumed in the api and not on GitHub. | ||||
| * | | update ActionPack README links | Hrvoje Šimić | 2012-04-04 | 1 | -10/+10 |
| | | | |||||
* | | | Merge pull request #5182 from castlerock/content_tag_instead_string | Xavier Noria | 2012-04-05 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | content_tag used instead string for option | ||||
| * | | | content_tag used instead string for option | Vishnu Atrai | 2012-02-26 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #5750 from ahoward/master | Aaron Patterson | 2012-04-05 | 2 | -2/+22 |
|\ \ \ \ | | | | | | | | | | | mo fasta and mo betta the url_for | ||||
| * | | | | url_for: avoid a nil check. unroll a loop. handle most common case 1st. | ara.t.howard | 2012-04-05 | 1 | -18/+13 |
| | | | | | |||||
| * | | | | carefully and quickly merge url_for options | ara.t.howard | 2012-04-04 | 2 | -1/+26 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #5707 from morgoth/remove-unnecessary-block-in-fetch | Xavier Noria | 2012-04-05 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | removed unnecessary block when using fetch | ||||
| * | | | | removed unnecessary block when using fetch | Wojciech Wnętrzak | 2012-04-02 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #4446 from ayamomiji/patch-1 | José Valim | 2012-04-05 | 2 | -1/+8 |
|\ \ \ \ \ | |_|/ / / |/| | | | | prevent the cache sweeper ignores NoMethodError | ||||
| * | | | | prevent the cache sweeper ignores NoMethodError | ayaya | 2012-03-29 | 2 | -1/+8 |
| | | | | | |||||
* | | | | | Merge pull request #5716 from jurriaan/tr-gsub-cleanup | Santiago Pastorino | 2012-04-04 | 6 | -8/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Updated/changed unneeded tr/gsubs | ||||
| * | | | | | Updated/changed useless tr/gsubs | Jurriaan Pruis | 2012-04-03 | 6 | -8/+8 |
| | |/ / / | |/| | | | |||||
* | | | | | No need to extend ActiveSupport::Extend here | Oscar Del Ben | 2012-04-04 | 1 | -2/+0 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-04 | 2 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/engines.textile | ||||
| * | | | | Fix AC responder example | Alexey Vakhov | 2012-04-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Remove non-obligatory params in AC respond_to examples | Alexey Vakhov | 2012-04-03 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | minor elsif/else typo fix | Tieg Zaharia | 2012-04-03 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | add type option to atom feed entry builder | Sergey Nartimov | 2012-04-01 | 2 | -1/+35 |
| | | | | | | | | | | | | | | | | closes #5672 | ||||
* | | | | Merge pull request #5694 from hardipe/master | Santiago Pastorino | 2012-04-01 | 1 | -4/+0 |
|\ \ \ \ | |/ / / |/| | | | Tidy up cookies.rb a bit | ||||
| * | | | Useless/Confusing method definition removed | hardi | 2012-04-01 | 1 | -4/+0 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-01 | 3 | -3/+2 |
|\ \ \ \ | |||||
| * | | | | :success includes the whole 200 range, not just 200. | Erich Menge | 2012-04-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | # File lib/rack/response.rb, line 114 114: def successful?; @status >= 200 && @status < 300; end | ||||
| * | | | | CSRF messages are no longer controlled by 422.html because ↵ | Tony Primerano | 2012-03-28 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | InvalidAuthenticityToken is not raised | ||||
| * | | | | Fix quotes at select_tag examples | Anderson Dias | 2012-03-28 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #5691 from avakhov/form-label-block | José Valim | 2012-04-01 | 2 | -3/+17 |
|\ \ \ \ \ | | | | | | | | | | | | | Block version of label should wrapped in field_with_errors in case of error | ||||
| * | | | | | Small #label method refactoring, thanks @rafaelfranca | Alexey Vakhov | 2012-04-01 | 1 | -3/+2 |
| | | | | | | |||||
| * | | | | | Block version of label should wrapped in field_with_errors in case of error | Alexey Vakhov | 2012-04-01 | 2 | -1/+16 |
| | |/ / / | |/| | | | |||||
* / | | | | Tests :if option of force_ssl method | Alexey Vakhov | 2012-04-01 | 1 | -0/+23 |
|/ / / / | |||||
* | | | | Remove not needed requires | Santiago Pastorino | 2012-03-31 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge pull request #5664 from lest/patch-1 | Piotr Sarnacki | 2012-03-31 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | use `symbolize_keys` instead of `dup.symbolize_keys!` | ||||
| * | | | | use `symbolize_keys` instead of `dup.symbolize_keys!` | Sergey Nartimov | 2012-03-30 | 1 | -2/+2 |
| | | | | |