aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused test code.Rafael Mendonça França2012-04-161-5/+0
| | | | | ActionController::RoutingError are raised in router execution time and can not be rescued in a controller.
* Update Rails 3.2.3 release date in changelogs as March 30, 2012Michael de Silva2012-04-161-1/+1
| | | | | The release date details have been taken from http://weblog.rubyonrails.org/2012/3/30/ann-rails-3-2-3-has-been-released/
* Merge pull request #5814 from lest/patch-4Piotr Sarnacki2012-04-131-12/+13
|\ | | | | don't duplicate default values in text helper
| * don't duplicate default values in text helperSergey Nartimov2012-04-111-12/+13
| |
* | Remove obsolete codeAlexey Vakhov2012-04-121-3/+0
| |
* | #send_file leans on Rack::Sendfile to X-Accel-Redirect the file's path, so ↵Jeremy Kemper2012-04-121-1/+21
| | | | | | | | opening the file to set the response body is wasteful. Set a FileBody wrapper instead that responds to to_path and streams the file if needed.
* | avoid autolinking by rdoc [ci skip]Vijay Dev2012-04-121-2/+2
| |
* | Merge pull request #5746 from jmbejar/index_method_form_builderSantiago Pastorino2012-04-113-5/+74
|\ \ | |/ |/| Add method FormBuilder#index
| * Add index method to FormBuilder. Useful when you use field_for and need to ↵Jorge Bejar2012-04-113-5/+74
| | | | | | | | know the index number into the iteration.
* | no need in temporary array in number_to_phone helperSergey Nartimov2012-04-091-2/+2
| |
* | Adding itemscope to list of boolean attributes.Frankie Roberto2012-04-092-3/+3
| | | | | | | | | | | | 'itemscope' is defined within HTML5 for use in microdata markup. See http://www.whatwg.org/specs/web-apps/current-work/multipage/microdata.ht ml#attr-itemscope
* | Merge pull request #5783 from rafaelfranca/default_url_optionsSantiago Pastorino2012-04-082-2/+2
|\ \ | | | | | | Document that default_url_options must return a hash with symbolized keys
| * | default_url_options does not receive one argument anymoreRafael Mendonça França2012-04-082-2/+2
| | |
* | | Revert "Merge pull request #5750 from ahoward/master"Santiago Pastorino2012-04-082-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_html5Jeremy Kemper2012-04-0813-168/+168
|\ \ | | | | | | Remove unnecessary in HTML 5 type attribute with default value
| * | Remove unnecessary in HTML 5 type attribute with default valueAndrey A.I. Sitnik2012-04-0513-168/+168
| | |
* | | 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
| | | |