aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Move render_to_body logic to return a spaced string to AC::RenderingCarlos Antonio da Silva2012-01-175-9/+5
* Remove method missing handling when action is not found, use action missing i...Carlos Antonio da Silva2012-01-172-53/+0
* Refactor render nothing/text => nil logic, and move to right placeCarlos Antonio da Silva2012-01-172-3/+4
* Move render :nothing and :text => nil options to AC::RenderingCarlos Antonio da Silva2012-01-172-10/+3
* Rename test class and fix tests to keep consistencyCarlos Antonio da Silva2012-01-171-10/+10
* Remove deprecated logic to render templates starting with /Carlos Antonio da Silva2012-01-172-23/+0
* Remove relative url root setting from ENV varCarlos Antonio da Silva2012-01-171-4/+0
* Remove rescue_action from compatibility module and testsCarlos Antonio da Silva2012-01-1723-87/+7
* Remove other old compatibility constantsCarlos Antonio da Silva2012-01-176-15/+12
* Remove constant already defined in exceptions moduleCarlos Antonio da Silva2012-01-171-3/+0
* Remove old compatibility methods not being usedCarlos Antonio da Silva2012-01-174-15/+2
* Merge pull request #4462 from spohlenz/fix-routing-testsAaron Patterson2012-01-161-0/+4
|\
| * Stub ip method of alternative request classSam Pohlenz2012-01-141-0/+4
* | use Rack::BodyProxy in AD::ReloaderSergey Nartimov2012-01-162-33/+3
* | Merge pull request #4467 from castlerock/changelog_for_deprecatedVijay Dev2012-01-151-0/+17
|\ \
| * | changelog entry for deprecated ActionController::Integration, ActionControlle...Vishnu Atrai2012-01-151-0/+17
* | | Bump Sprockets to 2.2.0Guillermo Iguaran2012-01-141-1/+1
|/ /
* | Deprecate ActionController::Integration, ActionController::IntegrationTest, A...Vishnu Atrai2012-01-153-1/+10
* | refactor response_body= methodVasiliy Ermolovich2012-01-141-7/+1
* | Add begin/ensure block since we are returning.José Valim2012-01-141-3/+5
|/
* Use a BodyProxy instead of including a Module that responds to close.Santiago Pastorino2012-01-134-15/+47
* removed unnecessary test_pass test from form_tag_helper_test.rbKarunakar (Ruby)2012-01-131-4/+0
* remove unused private methodsSergey Nartimov2012-01-131-16/+0
* use Rack::Utils.escape_pathSergey Nartimov2012-01-131-1/+1
* Merge pull request #4434 from carlosantoniodasilva/action-view-refactorJosé Valim2012-01-134-34/+41
|\
| * Refactor url_for helper to check for nil in the case statement onlyCarlos Antonio da Silva2012-01-121-8/+8
| * Delegate data tag option to tag option for escapingCarlos Antonio da Silva2012-01-121-5/+6
| * Remove value argument from boolean optionCarlos Antonio da Silva2012-01-121-2/+2
| * Return faster when no option is givenCarlos Antonio da Silva2012-01-121-12/+11
| * Refactor and improve readabilityCarlos Antonio da Silva2012-01-121-8/+7
| * Split tag options helper in smaller methodsCarlos Antonio da Silva2012-01-121-9/+21
| * Remove deprecated and not used methodCarlos Antonio da Silva2012-01-121-6/+0
| * Extract asset paths uri regexp to a constantCarlos Antonio da Silva2012-01-121-1/+3
* | Do not check if record is an Array twiceRafael Mendonça França2012-01-121-4/+3
|/
* Merge pull request #4429 from marcinbunsch/1923-force-ssl-redirect-keep-flashJosé Valim2012-01-122-1/+38
|\
| * When force redirecting to SSL, make sure that the session is kept. As we're m...Marcin Bunsch and Przemek Dąbek2012-01-122-1/+38
* | depend on journey 1.0.0Aaron Patterson2012-01-121-1/+1
* | Merge pull request #4387 from Karunakar/releasenotesVijay Dev2012-01-121-3/+3
|\ \
| * | Added the release dates for rails 3.1.1, rails 3.1.2, rails 3.1.3Karunakar (Ruby)2012-01-081-3/+3
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-01-131-2/+2
|\ \ \
| * | | Changed 'proc' to 'Proc.new' in ActionController::Caching::Actions descriptionAlejandro Andrés2012-01-121-2/+2
* | | | Merge pull request #4427 from kennyj/fix_3980José Valim2012-01-121-3/+9
|\ \ \ \
| * | | | Fix GH #3980. Support assets:cache:clean method to respect sprockets cache.kennyj2012-01-131-3/+9
| | |_|/ | |/| |
* | | | Merge pull request #4419 from j-manu/4255-handle-spaces-in-protocolsAaron Patterson2012-01-122-2/+9
|\ \ \ \
| * | | | Handle leading spaces in protocol while sanitizingManu2012-01-122-2/+9
| |/ / /
* | | | Delegate subdomain method to the URL module, removing duplicationCarlos Antonio da Silva2012-01-121-1/+1
* | | | Simplify named host logic and missing host condition checkCarlos Antonio da Silva2012-01-121-2/+2
* | | | Extract ip host regexp to a constantCarlos Antonio da Silva2012-01-121-1/+3
|/ / /
* | | html_escape already handles nilSantiago Pastorino2012-01-111-1/+1
* | | Tiny refactorSantiago Pastorino2012-01-111-3/+2
|/ /