aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5961 from bogdan/routesJeremy Kemper2012-04-241-20/+26
|\ | | | | Refactor ActionDispatch::HTTP::Url#url_for
| * ActionDispatch::HTTP::Url#url_for refactor methodBogdan Gusiev2012-04-241-20/+26
| | | | | | | | | | Separated right side url generation(before query string) from left side url generation(after query string)
* | Merge pull request #5927 from avakhov/distance_of_time_in_words-swapJeremy Kemper2012-04-242-16/+41
|\ \ | | | | | | Distance of time in words should work correctly if from_time > to_time
| * | Use leap years trick in distance_of_time_in_words only for distances between ↵Alexey Vakhov2012-04-242-12/+18
| | | | | | | | | | | | real date points
| * | fixed non matching documentation behaviour with method semantics on ↵Marcelo Casiraghi2012-04-242-3/+20
| | | | | | | | | | | | distance_of_time_in_words
| * | Distance of time in words should work correct if from time > to_timeAlexey Vakhov2012-04-242-2/+4
| | |
* | | Refactor hash creation in routesetCarlos Antonio da Silva2012-04-241-3/+4
| |/ |/|
* | RouteSet: decomplecting a way to handle positional argsBogdan Gusiev2012-04-241-26/+20
|/
* RouteSet: simplify routes helpers generation codeBogdan Gusiev2012-04-241-13/+21
|
* Add missing requires in routesBogdan Gusiev2012-04-232-0/+3
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-213-4/+4
|\
| * Comma missedAlexey Vakhov2012-04-211-1/+1
| |
| * Fix example in ActionView::Helpers::FormHelperThibaut Courouble2012-04-201-1/+1
| |
| * Fix formattingOscar Del Ben2012-04-181-2/+2
| |
* | Merge pull request #5865 from tiegz/minor_fixesAaron Patterson2012-04-202-35/+22
|\ \ | | | | | | Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
| * | converting some tests to assert_raises, and DRY'ing retrieve_variable changesTieg Zaharia2012-04-162-40/+18
| | |
| * | catch nil.to_sym errors in partial_renderer, and raise ArgumentError insteadTieg Zaharia2012-04-162-1/+10
| | |
* | | Freeze the middleware stack after it's builtJeremy Kemper2012-04-201-1/+1
| |/ |/| | | | | | | | | So apps that accidentally add middlewares later aren't unwittingly dumping them in a black hole. Closes #5911
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-184-6/+9
|\ \
| * | let's keep the slash in the return value instead of the path variable [ci skip]Vijay Dev2012-04-181-2/+2
| | |
| * | Warn about do end syntax in redirect optionOscar Del Ben2012-04-171-0/+3
| | |
| * | Fix redirect with block exampleAlexey Vakhov2012-04-171-3/+3
| | |
| * | Fix example in flash middlewareAlexey Vakhov2012-04-171-1/+1
| | |
| * | Fix comment in AD http responseAlexey Vakhov2012-04-131-1/+1
| | | | | | | | | | | | response in integration test accessible without @ via attr_reader
| * | Fix HTML sanitizer allowed_css_properties commentAlexey Vakhov2012-04-131-1/+1
| | |
* | | 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