aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Added reference to I18n.localize, as discussed here:Ernesto Tagwerker2012-05-041-0/+3
| | | | https://github.com/rails/rails/issues/4027
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-044-12/+29
|\
| * Corrected the name of the module that should be included to get the url helpers.Anuj Dutta2012-05-031-1/+1
| |
| * Fix example url in text helperAlexey Vakhov2012-05-021-1/+1
| |
| * Fix form tag with non GET/POST method exampleAlexey Vakhov2012-05-021-1/+1
| |
| * Documentation fix in options_for_select helper. Fixed display errors caused ↵Rodrigo Pavano2012-05-011-9/+26
| | | | | | | | by mixing Ruby and HTML code inside the same pre tag [ci skip]
* | Merge pull request #6148 from twinturbo/head-fixJosé Valim2012-05-031-1/+21
|\ \ | | | | | | Make ActionController#head pass rack-link
| * | Remove content-length as welltwinturbo2012-05-031-2/+3
| | |
| * | Make ActionController#head pass rack-linktwinturbo2012-05-031-1/+20
| | |
* | | RouteSet: optimize routes generation when globbing is usedBogdan Gusiev2012-05-031-2/+5
| | |
* | | Allows assert_redirected_to to accept a regular expressionAndy Lindeman2012-05-031-13/+20
| | |
* | | use extract_options!Paul McMahon2012-05-031-1/+2
| | |
* | | Merge pull request #6138 from bogdan/routesJosé Valim2012-05-031-19/+10
|\ \ \ | | | | | | | | RouteSet: remove some code dups
| * | | RouteSet: remove some code dupsBogdan Gusiev2012-05-021-19/+10
| | | |
* | | | Merge pull request #6131 from schneems/schneems/routes_backtraceSantiago Pastorino2012-05-021-1/+3
|\ \ \ \ | | | | | | | | | | Add backtrace to development routing error page
| * | | | Add backtrace to development routing error pageschneems2012-05-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a user gets a routing error due to a view helper such as using user_path without an :id they must go to their logs to see the backtrace. By adding in the trace template, a user can see which line the error occurred on without leaving the browser. When a routing error occurs outside of the view the application trace will be blank and will not confuse developers.
* | | | | Reset the request parameters after a constraints checkAndrew White2012-05-022-0/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A callable object passed as a constraint for a route may access the request parameters as part of its check. This causes the combined parameters hash to be cached in the environment hash. If the constraint fails then any subsequent access of the request parameters will be against that stale hash. To fix this we delete the cache after every call to `matches?`. This may have a negative performance impact if the contraint wraps a large number of routes as the parameters hash is built by merging GET, POST and path parameters. Fixes #2510.
* | | | Merge pull request #6125 from ncri/masterJosé Valim2012-05-021-2/+4
|\ \ \ \ | | | | | | | | | | Adding proc evaluation for action caching layout parameter
| * | | | added proc evaluation for action cache's layout parameterNico2012-05-021-2/+4
| |/ / /
* | | | Merge pull request #6122 from amerine/add_fetch_to_actiondispatch_http_headersAaron Patterson2012-05-021-7/+8
|\ \ \ \ | | | | | | | | | | Enable ActionDispatch::Http::Headers to support fetch
| * | | | Enable ActionDispatch::Http::Headers to support fetchMark Turner2012-05-021-7/+8
| |/ / /
* / / / * move exception message to exception constructorAaron Patterson2012-05-021-5/+11
|/ / / | | | | | | | | | | | | * save original exception * keep original backtrace
* | / ActionPack routes: remove some useless code.Bogdan Gusiev2012-05-021-26/+4
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-017-20/+18
|\ \
| * | Fix rdoc formatting in Mime::TypeMark Rushakoff2012-04-291-5/+5
| | |
| * | Reword polymorphic routes + mounted engine rdocMark Rushakoff2012-04-291-8/+6
| | | | | | | | | | | | Also correctly indent its example code.
| * | Code-format references to config settingsMark Rushakoff2012-04-274-4/+4
| | |
| * | More using <tt>x</tt> instead of +x+ when the latter renders improperly.Mark Rushakoff2012-04-272-3/+3
| | |
* | | distance_of_time_in_words: Add/tweak comments to understand time intervals ↵Elliot Winkler2012-04-301-7/+12
| | | | | | | | | | | | better
* | | distance_of_time_in_words: 45-60 days is about 2 months, not about 1 monthElliot Winkler2012-04-301-2/+3
| |/ |/|
* | Merge pull request #5705 from lest/patch-3Jeremy Kemper2012-04-301-1/+5
|\ \ | | | | | | split CDATA end token in cdata_section helper
| * | split CDATA end token in cdata_section helperSergey Nartimov2012-04-301-1/+5
| | |
* | | Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_storesJosé Valim2012-04-301-0/+7
|\ \ \ | | | | | | | | Support cookie jar options for all cookie stores
| * | | Support cookie jar options for all cookie storesbrainopia2012-04-301-0/+7
| | | |
* | | | Merge pull request #6082 from brainopia/smarter_cookie_jarJosé Valim2012-04-301-7/+10
|\ \ \ \ | | | | | | | | | | Stream cookies only if needed
| * | | | Dont stream back cookie value if it was set to the same valuebrainopia2012-04-301-4/+6
| | | | |
| * | | | Dont set cookie header for deletion of unexisting databrainopia2012-04-301-1/+2
| | | | |
| * | | | Simplify matching with array of possible domainsbrainopia2012-04-301-1/+1
| | | | |
| * | | | Use more appropriate one-liner for class declarationbrainopia2012-04-301-1/+1
| | | | |
* | | | | Merge pull request #6083 from brainopia/remove_unused_closed_ivarsJosé Valim2012-04-302-2/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | Remove a couple of unused ivars left from previous refactoring
| * | | | Remove unused ivars left from close checksbrainopia2012-04-302-2/+0
| | |/ / | |/| | | | | | | | | | These ivars were missed in d142572567 when close checks were removed
* | | | Merge pull request #3726 from JanDupal/fix-date-helper-hiddenJosé Valim2012-04-301-0/+2
|\ \ \ \ | |_|/ / |/| | | fix Helpers::DateHelper with :use_hidden - hide separators
| * | | fix Helpers::DateHelper with :use_hidden - hide separatorsJan Dupal2011-11-221-0/+2
| | | |
* | | | Merge pull request #6077 from ↵José Valim2012-04-301-27/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | dmitriy-kiriyenko/improve_signature_of_time_in_words_helper Replace boolean argument with an options hash.
| * | | | Replace boolean argument with an options hash.Dmitriy Kiriyenko2012-04-301-27/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces `include_seconds` argument with an option key `include_seconds => true` in options hash. Also `time_ago_in_words` now passes options hash, including a `locale` key, which makes in compatible with `distance_of_time_in_words`.
* | | | | Merge pull request #6078 from lest/patch-4José Valim2012-04-301-18/+12
|\ \ \ \ \ | | | | | | | | | | | | allow send_file/send_data to skip disposition header, closes #2973
| * | | | | no need to dup options in send_dataSergey Nartimov2012-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | options aren't modified inside send_file_headers!
| * | | | | allow send_file/send_data to skip disposition header, closes #2973Sergey Nartimov2012-04-301-17/+11
| |/ / / /
* | | | | Merge pull request #6034 from ↵Piotr Sarnacki2012-04-302-7/+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-282-7/+3
| | |_|_|/ | |/| | | | | | | | | | | | | dangerous especially with Rack::Cache), it should only be loaded when the flash method is called