aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
* Use more appropriate one-liner for class declarationbrainopia2012-04-301-1/+1
|
* Merge pull request #6034 from ↵Piotr Sarnacki2012-04-301-6/+3
|\ | | | | | | | | willbryant/flash_must_not_load_session_on_every_request_master Fix the Flash middleware loading the session on every request
| * fix the Flash middleware loading the session on every request (very ↵Will Bryant2012-04-281-6/+3
| | | | | | | | dangerous especially with Rack::Cache), it should only be loaded when the flash method is called
* | Merge pull request #6074 from mark-rushakoff/unused-variablesJeremy Kemper2012-04-291-1/+0
|\ \ | | | | | | Remove some unused variable assignments
| * | Remove unused assignmentsMark Rushakoff2012-04-291-1/+0
| |/
* | Restore interpolation of path option in redirect routesAndrew White2012-04-291-0/+10
| |
* | Escape interpolated params when redirecting - fixes #5688Andrew White2012-04-291-1/+7
|/
* Shadowing variable warning removedArun Agrawal2012-04-261-3/+3
|
* Allow loading external route files from the routerJose and Yehuda2012-04-252-0/+18
| | | | | | | | | This feature enables the ability to load an external routes file from the router via: draw :filename External routes files go in +config/routes+. This feature works in both engines and applications.
* Merge pull request #5980 from gazay/valid_ipsJeremy Kemper2012-04-251-22/+68
|\ | | | | Remote ip logic and validation. IPv6 support.
| * Valid ips v4 and v6. Right logic for working with X-FORWARDED-FOR header and ↵Alexey Gaziev2012-04-251-22/+68
| | | | | | | | tests.
* | Remove unnecessary empty line José Valim2012-04-251-1/+0
| |
* | Remove default match without specified methodJose and Yehuda2012-04-241-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current router DSL, using the +match+ DSL method will match all verbs for the path to the specified endpoint. In the vast majority of cases, people are currently using +match+ when they actually mean +get+. This introduces security implications. This commit disallows calling +match+ without an HTTP verb constraint by default. To explicitly match all verbs, this commit also adds a :via => :all option to +match+. Closes #5964
* | 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)
* | | 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-211-2/+2
|\
| * Fix formattingOscar Del Ben2012-04-181-2/+2
| |
* | 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
* 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
* Revert "Merge pull request #5750 from ahoward/master"Santiago Pastorino2012-04-081-10/+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 branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-071-1/+1
|\
| * Fix example action dispatch in mime typeAlexey Vakhov2012-04-071-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-051-1/+1
| | | | | | | | 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
* 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-041-1/+17
|
* Merge pull request #5716 from jurriaan/tr-gsub-cleanupSantiago Pastorino2012-04-042-3/+3
|\ | | | | Updated/changed unneeded tr/gsubs
| * Updated/changed useless tr/gsubsJurriaan Pruis2012-04-032-3/+3
| |
* | No need to extend ActiveSupport::Extend hereOscar Del Ben2012-04-041-2/+0
|/
* 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-011-1/+1
|\ \ | |/ |/|
| * :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
* | Remove not needed requiresSantiago Pastorino2012-03-311-1/+0
| |
* | Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-301-0/+1
| |
* | adds delegetion for eof? to AD::Http::UploadedFileJens Fahnenbruck2012-03-271-1/+1
|/ | | | | if you want to read the file you may need to ask if there is something to read from
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-271-0/+19
|\
| * add missing do [ci skip]Vijay Dev2012-03-271-1/+1
| |
| * added shallow_prefix option description in documantationLukasz Sarnacki2012-03-271-0/+19
| | | | | | | | It is in response for confusion in issue #5301
* | Return the same session data object when setting session idCarlos Antonio da Silva2012-03-261-1/+2
| |
* | Allow a defining custom member field on resourcesJamie Macey2012-03-251-4/+5
| | | | | | | | | | | | | | | | | | | | By default, resources routes are created with :resource/:id. A model defining to_param can make prettier urls by using something more readable than an integer ID, but since the route picks it up as :id you wind up with awkward User.find_by_username(params[:id]) calls. By overriding the key to be used in @request.params you can be more obvious in your intent.