aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * When force redirecting to SSL, make sure that the session is kept. As we're ↵Marcin Bunsch and Przemek Dąbek2012-01-122-1/+38
| | | | | | | | moving from a non-secure to secure environment, it's safe
* | 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.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 task.
| * | | | 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 sanitizing
| * | | | 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
|/ /
* | 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
| | |
* | | Add CHANGELOG entrySantiago Pastorino2012-01-101-0/+2
| | |
* | | Rails initialization with initialize_on_precompile = false should set assets_dirSantiago Pastorino2012-01-101-1/+4
| | |
* | | AC:TestCase::Behavior#head only accepts parameters as second argumentRafael Mendonça França2012-01-102-1/+5
| | |
* | | Whitespaces :scissors:Rafael Mendonça França2012-01-101-4/+4
| | |
* | | Fix ActionController::TestCase::Behavior.headRafael Mendonça França2012-01-102-1/+6
| | |
* | | Merge pull request #4371 from rafaelfranca/test_unit_cleanupAaron Patterson2012-01-093-6/+7
|\ \ \ | |_|/ |/| | Test unit cleanup
| * | Whitespaces :scissors:Rafael Mendonça França2012-01-061-1/+1
| | |
| * | Test constant is not defined anymoreRafael Mendonça França2012-01-061-3/+5
| | |
| * | Use MiniTest::Assertions instead of Test::Unit::AssertionsRafael Mendonça França2012-01-061-2/+1
| | |
* | | Extend the set of compressible files by some common types.r-stu312012-01-081-1/+1
| | |
* | | Enable to handle over in options the regexp determining which files to gzip.r-stu312012-01-081-1/+2
| | |
* | | Symbol#[] method presents in Ruby 1.9Sergey Nartimov2012-01-071-1/+1
| | |
* | | instance_variables method returns symbols in 1.9 rubySergey Nartimov2012-01-072-27/+27
| | |
* | | get rid of using instance_variable_names method from ASSergey Nartimov2012-01-074-13/+12
| | | | | | | | | | | | | | | - instance_variables return symbols in 1.9 - there is instance_variable_defined? method
* | | Merge pull request #4369 from lest/remove-warningsPiotr Sarnacki2012-01-071-2/+2
|\ \ \ | | | | | | | | use stub instead of redefining method to suppress warnings
| * | | use stub instead of redefining method to suppress warningsSergey Nartimov2012-01-071-2/+2
| | | |
* | | | add benchmark helper that works in erbSergey Nartimov2012-01-073-3/+39
| |/ / |/| |
* | | register spec subclasses for people who specAaron Patterson2012-01-061-0/+6
| | |
* | | require minitest rather than test/unitAaron Patterson2012-01-062-2/+2
|/ /
* | convert build_message to sprintfAaron Patterson2012-01-061-9/+5
| |
* | use assert_equal and assert_operatorAaron Patterson2012-01-061-5/+8
| |
* | use sprintf rather than build_messageAaron Patterson2012-01-061-4/+6
| |
* | Just use assert_equalAaron Patterson2012-01-061-3/+2
| |
* | refactor assert_responseAaron Patterson2012-01-061-7/+10
| |
* | test response assertionsAaron Patterson2012-01-064-11/+56
| |
* | no need for assert_blockAaron Patterson2012-01-061-3/+3
| |
* | stop using build_message for creating a stringAaron Patterson2012-01-061-1/+1
| |
* | use assert_includes rather than calling includes? specificallyAaron Patterson2012-01-061-2/+2
| |
* | just use assert and refute rather than building messagesAaron Patterson2012-01-061-6/+2
| |
* | Merge pull request #4327 from Karunakar/minorAaron Patterson2012-01-061-1/+1
|\ \ | | | | | | removed warning because logger.warn differentiate the warings
| * | removed warning because logger.warn differentiate the waringsKarunakar (Ruby)2012-01-051-1/+1
| | |