aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* backporting IO#binread for 1.8 usersAaron Patterson2011-08-082-0/+38
* be explicit about arguments passed aroundAaron Patterson2011-08-081-2/+2
* Remove TODO comment I didn't mean to commitJon Leighton2011-08-091-2/+0
* Bump arel versionJon Leighton2011-08-081-1/+1
* Fully marshal AR::Base objects. Fixes #2431.Jon Leighton2011-08-082-21/+13
* Make it the responsibility of the connection to hold onto an ARel visitor for...Jon Leighton2011-08-0823-68/+122
* Merge pull request #2426 from pivotal-casebook/fix-buildAaron Patterson2011-08-081-7/+7
|\
| * Make rails gem build directory consistent with actionpack, etc.Andrew Marshall & Sean Moon2011-08-041-7/+7
* | Merge pull request #2466 from rsim/fix_test_disable_referential_integrityAaron Patterson2011-08-081-0/+3
|\ \
| * | Fixed test_disable_referential_integrity on OracleRaimonds Simanovskis2011-08-081-0/+3
|/ /
* | Initialize config.assets.version the same way it's done in SprocketsSantiago Pastorino2011-08-082-1/+2
* | Merge pull request #2448 from igrigorik/masterJoshua Peek2011-08-084-2/+16
|\ \
| * | use assets.version in asset checksum to allow user to easily overrideIlya Grigorik2011-08-051-1/+1
| * | Merge branch 'asset_hash_should_depend_on_env'Ilya Grigorik2011-08-042-0/+14
| |\ \
| | * | generate environment dependent asset digestsIlya Grigorik2011-08-042-0/+14
| | * | Clear out tmp/cache when assets:clean is invoked.Ilya Grigorik2011-08-042-2/+2
| * | | Clear out tmp/cache when assets:clean is invoked.Ilya Grigorik2011-08-042-2/+2
| |/ /
* | | Merge pull request #2451 from gdelfino/masterAaron Patterson2011-08-071-3/+3
|\ \ \
| * | | sqlite transactions now loggedGustavo Delfino2011-08-061-3/+3
* | | | guides generation: apparently this workaround for RedCloth is not needed anymoreXavier Noria2011-08-072-47/+26
* | | | Merge pull request #2457 from Gregg/zombie_singular_fixXavier Noria2011-08-071-0/+1
|\ \ \ \
| * | | | Added irregular zombie inflection, so zombies no longer gets singularized int...Gregg Pollack2011-08-071-0/+1
|/ / / /
* | | | Merge pull request #2455 from vijaydev/patch-7Santiago Pastorino2011-08-071-0/+2
|\ \ \ \
| * | | | edit changelog to mention about x_sendfile_header default changeVijay Dev2011-08-291-0/+2
|/ / / /
* | | | x_sendfile_header now defaults to nil and production.rb env file doesn'tSantiago Pastorino2011-08-076-16/+7
* | | | Test against 1.9.3 as well.José Valim2011-08-071-0/+1
|/ / /
* | | Merge pull request #2450 from guilleiguaran/activesupport-gzip-1.8Santiago Pastorino2011-08-061-0/+1
|\ \ \
| * | | Fix ActiveSupport::Gzip under Ruby 1.8.7. Closes #2416Guillermo Iguaran2011-08-061-0/+1
* | | | Merge pull request #2444 from elight/masterSantiago Pastorino2011-08-061-5/+11
|\ \ \ \
| * | | | Refactored to more closely resemble idiom applied for on_nilEvan Light2011-08-051-5/+11
* | | | | Use rake >= 0.9.3.beta.1 in Ruby 1.9.3Santiago Pastorino2011-08-061-1/+6
|/ / / /
* | | | Avoid generating app/views/layouts/application.html.erb on mountable engines,...Santiago Pastorino2011-08-052-2/+0
* | | | Revert "Test against Rubinius"Aaron Patterson2011-08-051-3/+1
* | | | Merge pull request #2442 from sferik/test_on_rubiniusAaron Patterson2011-08-051-1/+3
|\ \ \ \
| * | | | Test against RubiniusErik Michaels-Ober2011-08-051-1/+3
|/ / / /
* | | | Revert "to_key on a destroyed model should return nil". Closes #2440Santiago Pastorino2011-08-052-4/+3
* | | | Fix test for RubiniusSantiago Pastorino2011-08-051-1/+1
|/ / /
* | | Merge pull request #2439 from guilleiguaran/fix-error-on-ar-tests-rbxdayAaron Patterson2011-08-051-0/+1
|\ \ \
| * | | Fix AR test suite error under Rubinius 2.0Guillermo Iguaran2011-08-051-0/+1
| |/ /
* / / pg does not allow aliases in the having clause, but functions are fineAaron Patterson2011-08-051-1/+1
|/ /
* | Merge branch 'master' of github.com:rails/railsXavier Noria2011-08-041-2/+1
|\ \
| * | we should not ignore all gems in hereAaron Patterson2011-08-041-2/+1
* | | Revert "Explicitly included hashes in sentence regarding SQL-injection-safe f...Xavier Noria2011-08-041-3/+3
* | | Revert "grammatical changes"Xavier Noria2011-08-041-2/+1
* | | The trailing '/' isn't being picked up by Github anyway, and the link works a...Rashmi Yadav2011-08-044-4/+4
* | | The trailing '/' isn't being picked up by Github anyway, and the link works a...Waynn Lue2011-08-041-1/+1
* | | grammatical changesJudeArasu2011-08-041-1/+2
* | | typo fixVijay Dev2011-08-041-1/+1
* | | minor changes in migrations guideVijay Dev2011-08-041-4/+4
* | | fixed incorrect tagsVijay Dev2011-08-041-16/+16