aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #5772 from lest/patch-4Xavier Noria2012-04-071-6/+4
|\ \ \ | | | | | | | | use extract_options! in cycle helper
| * | | use extract_options! in cycle helperSergey Nartimov2012-04-071-6/+4
| | | |
* | | | avoid empty api pagesVijay Dev2012-04-083-4/+7
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-071-1/+1
|\ \ \
| * | | Fix example action dispatch in mime typeAlexey Vakhov2012-04-071-1/+1
| | | |
* | | | pass default value as argument to fetchSergey Nartimov2012-04-061-1/+1
| | | |
* | | | documents the contract for the argument of AD::Routing::RouteSet#url_forXavier Noria2012-04-051-0/+1
| | | |
* | | | Make url_for work when option is nil and default_url_options hasRafael Mendonça França2012-04-052-1/+10
| | | | | | | | | | | | | | | | stringified keys
* | | | Fix url_for when options is nilRafael Mendonça França2012-04-051-1/+1
|/ / / | | | | | | | | | | | | RouteSet#url_for was modifying the options hash that belong to the caller
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-051-0/+1
|\ \ \
| * | | Add AC record identifier example with not-persisted objectAlexey Vakhov2012-04-051-0/+1
| | | |
| * | | Revert "update ActionPack README links"Vijay Dev2012-04-051-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit aeb228c5be5e8a1e7d79ccaef3833f8f35b00046. Reason: The links are meant to be consumed in the api and not on GitHub.
| * | | update ActionPack README linksHrvoje Šimić2012-04-051-10/+10
| | | |
| * | | Revert "update ActionPack README links"Vijay Dev2012-04-041-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit aeb228c5be5e8a1e7d79ccaef3833f8f35b00046. Reason: The links are meant to be consumed in the api and not on GitHub.
| * | | update ActionPack README linksHrvoje Šimić2012-04-041-10/+10
| | | |
* | | | Merge pull request #5182 from castlerock/content_tag_instead_stringXavier Noria2012-04-051-2/+2
|\ \ \ \ | | | | | | | | | | content_tag used instead string for option
| * | | | content_tag used instead string for optionVishnu Atrai2012-02-261-2/+2
| | | | |
* | | | | Merge pull request #5750 from ahoward/masterAaron Patterson2012-04-052-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.howard2012-04-051-18/+13
| | | | |
| * | | | carefully and quickly merge url_for optionsara.t.howard2012-04-042-1/+26
| | |_|/ | |/| |
* | | | Merge pull request #5707 from morgoth/remove-unnecessary-block-in-fetchXavier Noria2012-04-051-1/+1
|\ \ \ \ | | | | | | | | | | removed unnecessary block when using fetch
| * | | | removed unnecessary block when using fetchWojciech Wnętrzak2012-04-021-1/+1
| | | | |
* | | | | Merge pull request #4446 from ayamomiji/patch-1José Valim2012-04-052-1/+8
|\ \ \ \ \ | |_|/ / / |/| | | | prevent the cache sweeper ignores NoMethodError
| * | | | prevent the cache sweeper ignores NoMethodErrorayaya2012-03-292-1/+8
| | | | |
* | | | | Merge pull request #5716 from jurriaan/tr-gsub-cleanupSantiago Pastorino2012-04-046-8/+8
|\ \ \ \ \ | | | | | | | | | | | | Updated/changed unneeded tr/gsubs
| * | | | | Updated/changed useless tr/gsubsJurriaan Pruis2012-04-036-8/+8
| | |/ / / | |/| | |
* | | | | No need to extend ActiveSupport::Extend hereOscar Del Ben2012-04-041-2/+0
| |_|_|/ |/| | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-042-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/engines.textile
| * | | | Fix AC responder exampleAlexey Vakhov2012-04-041-1/+1
| | | | |
| * | | | Remove non-obligatory params in AC respond_to examplesAlexey Vakhov2012-04-031-2/+2
| | | | |
* | | | | minor elsif/else typo fixTieg Zaharia2012-04-031-1/+1
| |/ / / |/| | |
* | | | add type option to atom feed entry builderSergey Nartimov2012-04-012-1/+35
| | | | | | | | | | | | | | | | closes #5672
* | | | Merge pull request #5694 from hardipe/masterSantiago Pastorino2012-04-011-4/+0
|\ \ \ \ | |/ / / |/| | | Tidy up cookies.rb a bit
| * | | Useless/Confusing method definition removedhardi2012-04-011-4/+0
| | | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-013-3/+2
|\ \ \ \
| * | | | :success includes the whole 200 range, not just 200.Erich Menge2012-04-011-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 Primerano2012-03-281-1/+0
| | | | | | | | | | | | | | | | | | | | InvalidAuthenticityToken is not raised
| * | | | Fix quotes at select_tag examplesAnderson Dias2012-03-281-1/+1
| | | | |
* | | | | Merge pull request #5691 from avakhov/form-label-blockJosé Valim2012-04-012-3/+17
|\ \ \ \ \ | | | | | | | | | | | | Block version of label should wrapped in field_with_errors in case of error
| * | | | | Small #label method refactoring, thanks @rafaelfrancaAlexey Vakhov2012-04-011-3/+2
| | | | | |
| * | | | | Block version of label should wrapped in field_with_errors in case of errorAlexey Vakhov2012-04-012-1/+16
| | |/ / / | |/| | |
* / | | | Tests :if option of force_ssl methodAlexey Vakhov2012-04-011-0/+23
|/ / / /
* | | | Remove not needed requiresSantiago Pastorino2012-03-311-1/+0
| | | |
* | | | Merge pull request #5664 from lest/patch-1Piotr Sarnacki2012-03-311-2/+2
|\ \ \ \ | | | | | | | | | | use `symbolize_keys` instead of `dup.symbolize_keys!`
| * | | | use `symbolize_keys` instead of `dup.symbolize_keys!`Sergey Nartimov2012-03-301-2/+2
| | | | |
* | | | | Remove obsolete reader from AC::MethodNotAllowed exception classAlexey Vakhov2012-03-311-2/+0
| | | | |
* | | | | Remove AC::RenderError class second declarationAlexey Vakhov2012-03-311-3/+0
| | | | |
* | | | | Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-303-0/+10
|/ / / /
* | | | Merge pull request #5625 from ↵José Valim2012-03-286-13/+79
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nertzy/prefix_partial_path_with_controller_namespace Add config option to turn off prefixing partial path with controller namespace
| * | | | Make controller namespace partial prefix optionalGrant Hutchins2012-03-286-9/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.action_view.prefix_partial_path_with_controller_namespace This allows you to choose to render @post using /posts/_post.erb instead of /admin/posts/_post.erb inside Admin::PostsController.