aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #4497 from carlosantoniodasilva/action-controller-refactorJosé Valim2012-01-178-67/+20
|\ \
| * | Bring back rendering templates that start with / in nested structuresCarlos Antonio da Silva2012-01-171-0/+1
| * | Move protected instance variables definition, kill compatibility moduleCarlos Antonio da Silva2012-01-172-15/+5
| * | Remove deprecated default_charset= from AC::BaseCarlos Antonio da Silva2012-01-172-5/+2
| * | Move render_to_body logic to return a spaced string to AC::RenderingCarlos Antonio da Silva2012-01-174-7/+5
| * | Remove method missing handling when action is not found, use action missing i...Carlos Antonio da Silva2012-01-171-8/+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
| * | Remove deprecated logic to render templates starting with /Carlos Antonio da Silva2012-01-171-1/+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-171-4/+0
| * | Remove other old compatibility constantsCarlos Antonio da Silva2012-01-172-4/+1
| * | 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-172-6/+2
| |/
* | Merge pull request #4500 from kennyj/should_deprecate_rails_cacheAaron Patterson2012-01-172-4/+3
|\ \
| * | Deprecate RAILS_CACHE constant.kennyj2012-01-182-4/+3
| |/
* / Add option to configure Sprockets loggerRafael Mendonça França2012-01-171-1/+1
|/
* use Rack::BodyProxy in AD::ReloaderSergey Nartimov2012-01-162-33/+3
* 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-132-14/+31
* 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-121-0/+1
|\
| * When force redirecting to SSL, make sure that the session is kept. As we're m...Marcin Bunsch and Przemek Dąbek2012-01-121-0/+1
* | 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-121-1/+1
|\ \ \
| * | | Handle leading spaces in protocol while sanitizingManu2012-01-121-1/+1
| |/ /
* | | 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
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-01-112-1/+2
|\
| * Add missing endRafael Mendonça França2012-01-101-0/+1
| * Made an example a little more realisticcodesnik2012-01-071-1/+1