aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Jon Leighton2011-08-0823-68/+122
| | | | for generating SQL. This improves the code architecture generally, and solves some problems with marshalling. Adapter authors please take note: you now need to define an Adapter.visitor_for method, but it degrades gracefully with a deprecation warning for now.
* Merge pull request #2426 from pivotal-casebook/fix-buildAaron Patterson2011-08-081-7/+7
|\ | | | | Make rails gem build directory consistent with actionpack, etc.
| * 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 Oracle
| * | Fixed test_disable_referential_integrity on OracleRaimonds Simanovskis2011-08-081-0/+3
|/ / | | | | On Oracle disable_referential_integrity before execution of block will disable foreign key constraints and after block will enable them but when constraints are enabled then they are validated. Therefore created record with invalid foreign key should be deleted before enabling foreign key constraints.
* | 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
|\ \ | | | | | | Asset pipeline fixes: clear out tmp cache and use environment in digest generation
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | If two different environments are configured to use the pipeline, but one has an extra step (such as compression) then without taking the environment into account you may end up serving wrong assets
| | * | Clear out tmp/cache when assets:clean is invoked.Ilya Grigorik2011-08-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise, if bad data is cached in tmp/clear then the next invocation of assets:precompile (or a regular incoming request) will pickup files from tmp without regenerating them from source.
| * | | Clear out tmp/cache when assets:clean is invoked.Ilya Grigorik2011-08-042-2/+2
| |/ / | | | | | | | | | | | | | | | Otherwise, if bad data is cached in tmp/clear then the next invocation of assets:precompile (or a regular incoming request) will pickup files from tmp without regenerating them from source.
* | | Merge pull request #2451 from gdelfino/masterAaron Patterson2011-08-071-3/+3
|\ \ \ | | | | | | | | sqlite transactions in log files
| * | | sqlite transactions now loggedGustavo Delfino2011-08-061-3/+3
| | | | | | | | | | | | motivation: http://stackoverflow.com/questions/6892630/sqlite-transactions-not-showing-in-test-log
* | | | 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 != zomby
| * | | | Added irregular zombie inflection, so zombies no longer gets singularized ↵Gregg Pollack2011-08-071-0/+1
|/ / / / | | | | | | | | | | | | into zomby
* | | | Merge pull request #2455 from vijaydev/patch-7Santiago Pastorino2011-08-071-0/+2
|\ \ \ \ | | | | | | | | | | Edit changelog to mention about x_sendfile_header default change
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | set a particular value for it. This allows servers to set it through X-Sendfile-Type, read https://github.com/rack/rack/blob/master/lib/rack/sendfile.rb for more info. Anyways you can force this value in your production.rb
* | | | 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 #2416
| * | | 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
|\ \ \ \ | | | | | | | | | | Minor refactor to delegate
| * | | | 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 ↵Santiago Pastorino2011-08-052-2/+0
| | | | | | | | | | | | | | | | engines, just generate the namespaced one
* | | | Revert "Test against Rubinius"Aaron Patterson2011-08-051-3/+1
| | | | | | | | | | | | | | | | This reverts commit 3cfbb3824436b2f8a37544b8ffe2f3a4605bc7c8.
* | | | Merge pull request #2442 from sferik/test_on_rubiniusAaron Patterson2011-08-051-1/+3
|\ \ \ \ | | | | | | | | | | Test against Rubinius
| * | | | Test against RubiniusErik Michaels-Ober2011-08-051-1/+3
|/ / / / | | | | | | | | | | | | Happy Rubinius Day!
* | | | Revert "to_key on a destroyed model should return nil". Closes #2440Santiago Pastorino2011-08-052-4/+3
| | | | | | | | | | | | | | | | This reverts commit c5448721b5054b8a467958d60427fdee15eac604.
* | | | 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.0 #rbxday
| * | | 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 ↵Xavier Noria2011-08-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | forms" Reason: The hash form is secure, and preferred over the array form if possible. This reverts commit 6dc749596c328c44c80f898d5fa860fff6cab783.
* | | Revert "grammatical changes"Xavier Noria2011-08-041-2/+1
| | | | | | | | | | | | | | | | | | | | | Reason: As discussed in GitHub, it is debatable, and present tense is fine (and simple, and preferred). This reverts commit 54ccda9f0a5e4a5e72a4c159dc8787faaf65e8a2.
* | | The trailing '/' isn't being picked up by Github anyway, and the link works ↵Rashmi Yadav2011-08-044-4/+4
| | | | | | | | | | | | as is.
* | | The trailing '/' isn't being picked up by Github anyway, and the link works ↵Waynn Lue2011-08-041-1/+1
| | | | | | | | | | | | as is.
* | | 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
| | |
* | | Fix typo 'console' -> 'constant'pbflinn2011-08-041-1/+1
| | |
* | | Active Resource - guide for destroyVishnu Atrai2011-08-041-0/+9
| | |
* | | Active Resource - guide for update/saveVishnu Atrai2011-08-041-0/+10
| | |
* | | Active Resource - guide for createVishnu Atrai2011-08-041-1/+10
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 20:30:36 +0000