aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* 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 b...Rodrigo Pavano2012-05-011-9/+26
* | Merge pull request #6148 from twinturbo/head-fixJosé Valim2012-05-032-1/+87
|\ \
| * | Remove content-length as welltwinturbo2012-05-032-2/+9
| * | Make ActionController#head pass rack-linktwinturbo2012-05-032-1/+80
* | | RouteSet: optimize routes generation when globbing is usedBogdan Gusiev2012-05-031-2/+5
* | | Allows assert_redirected_to to accept a regular expressionAndy Lindeman2012-05-033-13/+26
* | | 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 dupsBogdan Gusiev2012-05-021-19/+10
* | | | Add CHANGELOG entrySantiago Pastorino2012-05-021-0/+2
* | | | Merge pull request #6131 from schneems/schneems/routes_backtraceSantiago Pastorino2012-05-021-1/+3
|\ \ \ \
| * | | | Add backtrace to development routing error pageschneems2012-05-021-1/+3
* | | | | Reset the request parameters after a constraints checkAndrew White2012-05-023-0/+25
|/ / / /
* | | | Merge pull request #6125 from ncri/masterJosé Valim2012-05-022-3/+36
|\ \ \ \
| * | | | added proc evaluation for action cache's layout parameterNico2012-05-022-3/+36
* | | | | Merge pull request #6122 from amerine/add_fetch_to_actiondispatch_http_headersAaron Patterson2012-05-022-7/+13
|\ \ \ \ \
| * | | | | Enable ActionDispatch::Http::Headers to support fetchMark Turner2012-05-022-7/+13
| |/ / / /
* / / / / * move exception message to exception constructorAaron Patterson2012-05-021-5/+11
|/ / / /
* | | | Merge pull request #6116 from romanvbabenko/refactor/executable_rakefilesJeremy Kemper2012-05-021-1/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Rakefile executable attributes and shebang lines has been removedRoman V. Babenko2012-05-021-1/+0
* | | | ActionPack routes: remove some useless code.Bogdan Gusiev2012-05-021-26/+4
|/ / /
* | / ActionPack: remove tests for hash_for_* methodsBogdan Gusiev2012-05-021-18/+0
| |/ |/|
* | 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
| * | 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 be...Elliot Winkler2012-04-302-18/+32
* | | distance_of_time_in_words: 45-60 days is about 2 months, not about 1 monthElliot Winkler2012-04-302-3/+6
| |/ |/|
* | Merge pull request #5705 from lest/patch-3Jeremy Kemper2012-04-302-1/+10
|\ \
| * | split CDATA end token in cdata_section helperSergey Nartimov2012-04-302-1/+10
* | | Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_storesJosé Valim2012-04-302-0/+14
|\ \ \
| * | | Support cookie jar options for all cookie storesbrainopia2012-04-302-0/+14
* | | | Merge pull request #6082 from brainopia/smarter_cookie_jarJosé Valim2012-04-302-15/+46
|\ \ \ \
| * | | | Dont stream back cookie value if it was set to the same valuebrainopia2012-04-302-4/+18
| * | | | Dont set cookie header for deletion of unexisting databrainopia2012-04-302-9/+26
| * | | | 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 unused ivars left from close checksbrainopia2012-04-302-2/+0
| | |/ / | |/| |
* | | | Merge pull request #3726 from JanDupal/fix-date-helper-hiddenJosé Valim2012-04-302-0/+34
|\ \ \ \ | |_|/ / |/| | |
| * | | fix Helpers::DateHelper with :use_hidden - hide separatorsJan Dupal2011-11-222-0/+34
* | | | Merge pull request #6077 from dmitriy-kiriyenko/improve_signature_of_time_in_...José Valim2012-04-304-64/+97
|\ \ \ \
| * | | | Replace boolean argument with an options hash.Dmitriy Kiriyenko2012-04-304-64/+97
* | | | | Merge pull request #6078 from lest/patch-4José Valim2012-04-302-18/+23
|\ \ \ \ \
| * | | | | no need to dup options in send_dataSergey Nartimov2012-04-301-1/+1