aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5465 from sandeepravi/warning_fixesJosé Valim2012-03-161-1/+1
|\
| * fixed - warning: assigned but unused variable - checkerSandeep2012-03-161-1/+1
|/
* Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgsPiotr Sarnacki2012-03-161-2/+2
|\
| * Fix exceptions messages in AC layoutsAlexey Vakhov2012-03-101-2/+2
* | Merge pull request #5461 from yakko/masterJosé Valim2012-03-161-0/+4
|\ \
| * | relation .present? and .blank? should not query SELECT COUNT(DISTINCT id)Thiago Almeida2012-03-161-0/+4
* | | Merge pull request #5327 from kennyj/fix_explicitly_inheraitance_columnAaron Patterson2012-03-152-1/+12
|\ \ \ | |/ / |/| |
| * | Don't reset inheritance_column when setting explicitly.kennyj2012-03-082-1/+12
* | | Merge pull request #5454 from luke-gru/luke-devPiotr Sarnacki2012-03-152-4/+44
|\ \ \
| * | | allow zero-arity proc for AbstrController::layoutLuke Gruber2012-03-152-4/+44
* | | | Merge pull request #5457 from brianmario/typo-fixAaron Patterson2012-03-151-1/+1
|\ \ \ \
| * | | | fix typo in redirect testBrian Lopez2012-03-151-1/+1
|/ / / /
* | | | Merge pull request #5456 from brianmario/redirect-sanitizationAaron Patterson2012-03-153-2/+22
|\ \ \ \ | |/ / / |/| | |
| * | | strip null bytes from Location header as wellBrian Lopez2012-03-153-2/+22
|/ / /
* | | errors should probably be logged as errorsAaron Patterson2012-03-151-20/+19
* | | Merge pull request #5451 from yahonda/address_hstores_failueAaron Patterson2012-03-151-1/+1
|\ \ \
| * | | Address the dump file format for hstoreYasuo Honda2012-03-151-1/+1
|/ / /
* | | Revert "AM::MassAssingmentSecurity: improve performance"José Valim2012-03-152-17/+19
* | | Merge pull request #5437 from kennyj/fix_5430Aaron Patterson2012-03-152-1/+8
|\ \ \
| * | | Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.kennyj2012-03-152-1/+8
* | | | Merge pull request #5337 from mreinsch/static_invalid_byte_sequenceAaron Patterson2012-03-152-0/+5
|\ \ \ \
| * | | | fix ArgumentError being raised in case of invalid byte sequencesMichael Reinsch2012-03-082-0/+5
* | | | | Merge pull request #5448 from JonRowe/patch_file_update_on_masterJosé Valim2012-03-152-1/+20
|\ \ \ \ \
| * | | | | escape commas in paths before globbing to avoid infinite hang in Dir[]Jon Rowe2012-03-152-1/+20
|/ / / / /
* | | | | Simplify helpers handling. Ensure Metal can run AC hooks.José Valim2012-03-156-37/+65
* | | | | Remove ActionController::TestCase#rescue_action_in_public!Piotr Sarnacki2012-03-152-10/+0
* | | | | Allow you to force the authenticity_token to be rendered even on remote forms...David Heinemeier Hansson2012-03-142-5/+20
* | | | | Do not include the authenticity token in forms where remote: true as ajax for...David Heinemeier Hansson2012-03-143-2/+27
* | | | | Remove remaining http_only? calls.José Valim2012-03-142-14/+4
* | | | | Remove --http.José Valim2012-03-1430-1020/+7
* | | | | Merge pull request #5357 from bagilevi/sweeper-undefined-method-ignoredPiotr Sarnacki2012-03-142-1/+17
|\ \ \ \ \
| * | | | | Don't ignore call to undefined method in SweeperLevente Bagi2012-03-062-1/+17
* | | | | | Merge pull request #5439 from carlosantoniodasilva/rake-test-scaffoldJosé Valim2012-03-143-5/+31
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix scaffold controller template, ensure rake scaffold test pass by defaultCarlos Antonio da Silva2012-03-143-5/+31
* | | | | | Add API apps CHANGELOG entrySantiago Pastorino2012-03-141-0/+2
|/ / / / /
* | | | | Update railties/guides/source/api_app.textileJosé Valim2012-03-141-2/+0
* | | | | Do not generate app/views and sprockets entries on http appCarlos Antonio da Silva2012-03-142-1/+21
* | | | | Generate special controller and functional test templates for http appsCarlos Antonio da Silva2012-03-1410-5/+181
* | | | | Rename http-only app generator option to httpCarlos Antonio da Silva2012-03-144-10/+10
* | | | | Move http only option to AppGeneratorCarlos Antonio da Silva2012-03-142-3/+3
* | | | | Add test to ensure setting config.generators.http_only actually disables the ...Carlos Antonio da Silva2012-03-142-2/+15
* | | | | Allow generator configs from http_only! to be overriden by appCarlos Antonio da Silva2012-03-142-1/+16
* | | | | Remove duplicated tests from shared generatorCarlos Antonio da Silva2012-03-142-16/+2
* | | | | Refactor http_only, remove reader methodCarlos Antonio da Silva2012-03-141-14/+19
* | | | | Disable template, helper and assets options when using http_only!Carlos Antonio da Silva2012-03-142-1/+32
* | | | | Create generators http_only! setup and hide some common namespaces for nowCarlos Antonio da Silva2012-03-143-4/+42
* | | | | Generate middleware http_only! config when running http only app generatorCarlos Antonio da Silva2012-03-142-1/+16
* | | | | Add http-only option to Rails app generatorCarlos Antonio da Silva2012-03-144-5/+18
* | | | | Add ActionController::HTTPSantiago Pastorino2012-03-1417-9/+383
* | | | | Merge pull request #5431 from bogdan/mas_performanceJosé Valim2012-03-142-19/+17
|\ \ \ \ \