aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #9464 from jcoyne/assert_template_fileRafael Mendonça França2013-03-073-2/+18
|\ \ \ \ | | | | | | | | | | Allow use of assert_template with the :file option.
| * | | | Allow use of assert_template with the :file option.Justin Coyne2013-03-013-2/+18
| | | | | | | | | | | | | | | | | | | | This worked in Rails 3.2, but was a regression in 4.0.0.beta1
* | | | | Merge pull request #9586 from robertomiranda/useless_trRafael Mendonça França2013-03-061-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Change useless tr to gsub
| * | | | | Change useless tr to gsubrobertomiranda2013-03-061-2/+2
| | |_|/ / | |/| | |
* / | | | Typo in comment to ActionView::Resolver#find_allRKushnir2013-03-061-1/+1
|/ / / /
* | / / Use gsub intead of tr when the to_str is longer than the from_strrobertomiranda2013-03-051-1/+1
| |/ / |/| |
* | | change useless gsub to trrobertomiranda2013-03-054-5/+5
| | |
* | | Merge pull request #9561 from ↵Carlos Antonio da Silva2013-03-051-1/+2
|\ \ \ | | | | | | | | | | | | | | | | inossidabile/explicit_match_via_requirement_exception_message Routing match `via` option requirement exception message made more explicit
| * | | Routing match `via` option requirement exception message made more explicitBoris Staal2013-03-051-1/+2
| | | |
* | | | change useless gsub to deleteBenjamin Sullivan2013-03-051-1/+1
|/ / /
* | | Fix formats on xhr requests when HTTP_ACCEPT is empty stringmaximerety2013-03-041-1/+1
| | | | | | | | | | | | | | | | | | Fix ActionDispatch::Request#formats on xhr requests when HTTP_ACCEPT header is empty string. About issue #7774, same fix as in commit bebb02f but for xhr requests.
* | | Use custom visitor class for optimized url helpersAndrew White2013-03-033-9/+13
|/ / | | | | | | | | | | | | | | Rather than trying to use gsub to remove the optional route segments, which will fail with nested optional segments, use a custom visitor class that returns a empty string for group nodes. Closes #9524
* | Merge pull request #9366 from killthekitten/fix-content_for-regressionRafael Mendonça França2013-02-281-1/+1
|\ \ | | | | | | Fix for #9360 content_for regression
| * | Fix #9360 regression in content_forNikolay Shebanov2013-02-251-1/+1
| | |
* | | Remove redundant methodAndrew White2013-02-281-8/+0
| | |
* | | `format: true` does not override existing format constraints.Yves Senn2013-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | Closes #9466. Passing `format: true` used to override the constraints: { format: /json/ } with `/.+/`. This patch only sets the format if there is no constraint present.
* | | Improve docs for AbsC::RenderingJosé Valim2013-02-271-3/+11
| | |
* | | Merge pull request #9452 from frodsan/remove_private_attribute_warningSteve Klabnik2013-02-261-1/+3
|\ \ \ | | | | | | | | remove private attribute? warning
| * | | remove private attribute? warningFrancesco Rodriguez2013-02-261-1/+3
| | | |
* | | | allow non-String default params in the router.Yves Senn2013-02-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9435. Skip valid encoding checks for non-String parameters that come from the matched route's defaults.
* | | | the router allows String contraints.Yves Senn2013-02-261-11/+17
| | | | | | | | | | | | | | | | Closes #9432.
* | | | Merge pull request #9434 from zires/devRafael Mendonça França2013-02-261-1/+1
|\ \ \ \ | |/ / / |/| | | Journey::Path::Pattern#new raise more meaningful exception message.
| * | | Make ActionDispatch::Journey::Path::Pattern#new raise more meaningful ↵zires2013-02-271-1/+1
| | | | | | | | | | | | | | | | exception message.
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-02-262-2/+2
|\ \ \ \
| * | | | Typo fix.Carson McDonald2013-02-211-1/+1
| | | | |
| * | | | improve grammar describing ActionDispatch::Cookies::CookieJar#deleteWeston Platter2013-02-191-1/+1
| | | | |
| * | | | improve grammar describing ActionDispatch::Cookies::CookieJar#deleteWeston Platter2013-02-191-1/+1
| | | | |
* | | | | Allow both a path and an option on root in config/routesSam Ruby2013-02-261-2/+9
| |/ / / |/| | |
* | | | Preparing for 4.0.0.beta1 releaseDavid Heinemeier Hansson2013-02-251-1/+1
| | | |
* | | | Merge pull request #8530 from dasch/dependency-trackersDavid Heinemeier Hansson2013-02-252-44/+98
|\ \ \ \ | |_|_|/ |/| | | Custom dependency trackers for the template digestor
| * | | Register trackers on extensions, not handlersDaniel Schierbeck2013-02-201-6/+11
| | | |
| * | | Rename ErbTracker to ERBTrackerDaniel Schierbeck2013-02-201-2/+2
| | | |
| * | | Return an empty array if no tracker is foundDaniel Schierbeck2013-02-201-2/+7
| | | |
| * | | Use a thread safe hashDaniel Schierbeck2013-02-201-1/+3
| | | |
| * | | Allow registering custom dependency trackersDaniel Schierbeck2013-02-201-1/+14
| | | |
| * | | Extract dependency tracking from DigestorDaniel Schierbeck2013-02-202-44/+73
| | | |
* | | | fix respond_to without blocks not working if one of the blocks is allgrosser2013-02-241-1/+1
| | | |
* | | | Fix debug helper not inspecting on ExceptionBouke van der Bijl2013-02-231-1/+1
| | | | | | | | | | | | The debug helper should inspect the object when it can't be converted to YAML, this behavior was changed in 8f8d8eb1465069e2ed9b6f2404aa9d02e785f534.
* | | | Merge pull request #9334 from NARKOZ/time_tagAndrew White2013-02-211-1/+3
|\ \ \ \ | | | | | | | | | | use ISO 8601 format in time_tag helper
| * | | | document setting custom datetime attribute for time_tag helperNihad Abbasov2013-02-221-0/+2
| | | | |
| * | | | fix time_tag helper and update tests to not rely on dynamically generated valuesNihad Abbasov2013-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before `time_tag Date.today` will return `<time datetime="2013-02-14T00:00:00+00:00">February 14, 2013</time>`. This commit fixes time_tag helper to use RFC-3339 full-date format (Y-m-d) in datetime attribute.
* | | | | completes pass over the AP changelog [ci skip]Xavier Noria2013-02-211-1/+1
| | | | |
* | | | | Merge pull request #9361 from senny/improved_match_shorthand_syntaxAndrew White2013-02-211-14/+12
|\ \ \ \ \ | | | | | | | | | | | | determine the match shorthand target early.
| * | | | | determine the match shorthand target early.Yves Senn2013-02-211-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #7554. This patch determines the `controller#action` directly in the `match` method when the shorthand syntax is used. this prevents problems with namespaces and scopes.
* | | | | | Revert "Revert "Merge pull request #4803 from lucascaton/master""Santiago Pastorino2013-02-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d.
* | | | | | This cache is not neededSantiago Pastorino2013-02-211-2/+1
| | | | | |
* | | | | | Use composition to figure out the forgery protection strategySantiago Pastorino2013-02-211-9/+27
| |_|_|_|/ |/| | | |
* | | | | Use #grep to filter priority zones when a regexp is givenCarlos Antonio da Silva2013-02-211-1/+1
| | | | |
* | | | | Use Array Difference to calculate the zones array, instead of iteratingCarlos Antonio da Silva2013-02-211-2/+2
|/ / / / | | | | | | | | | | | | It's faster, and doesn't force us to dup the timezones array.
* | | | Rack::Test::UploadedFile is a permitted scalarFabio Kreusch2013-02-211-3/+4
| | | |