Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Array#+ automatically dups, no double duping | Aaron Patterson | 2011-08-09 | 1 | -2/+2 |
| | |||||
* | Just remove the sort_locals method | Aaron Patterson | 2011-08-09 | 1 | -12/+1 |
| | |||||
* | the freeze trick does nothing on arrays used as hash keys. | Aaron Patterson | 2011-08-09 | 1 | -2/+1 |
| | |||||
* | use functional style to build a list of template objects | Aaron Patterson | 2011-08-09 | 1 | -9/+12 |
| | |||||
* | refactor the optimized build_query a bit | Aaron Patterson | 2011-08-08 | 1 | -8/+3 |
| | |||||
* | reduce file stats by improving our dir glob pattern | Aaron Patterson | 2011-08-08 | 1 | -1/+1 |
| | |||||
* | hash on the template directory in order to improve cache hits | Aaron Patterson | 2011-08-08 | 1 | -2/+3 |
| | |||||
* | use meaningful names with our variables | Aaron Patterson | 2011-08-08 | 1 | -6/+6 |
| | |||||
* | use binread to read the files | Aaron Patterson | 2011-08-08 | 1 | -1/+2 |
| | |||||
* | backporting IO#binread for 1.8 users | Aaron Patterson | 2011-08-08 | 2 | -0/+38 |
| | |||||
* | be explicit about arguments passed around | Aaron Patterson | 2011-08-08 | 1 | -2/+2 |
| | |||||
* | Remove TODO comment I didn't mean to commit | Jon Leighton | 2011-08-09 | 1 | -2/+0 |
| | |||||
* | Bump arel version | Jon Leighton | 2011-08-08 | 1 | -1/+1 |
| | |||||
* | Fully marshal AR::Base objects. Fixes #2431. | Jon Leighton | 2011-08-08 | 2 | -21/+13 |
| | |||||
* | Make it the responsibility of the connection to hold onto an ARel visitor ↵ | Jon Leighton | 2011-08-08 | 23 | -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-build | Aaron Patterson | 2011-08-08 | 1 | -7/+7 |
|\ | | | | | Make rails gem build directory consistent with actionpack, etc. | ||||
| * | Make rails gem build directory consistent with actionpack, etc. | Andrew Marshall & Sean Moon | 2011-08-04 | 1 | -7/+7 |
| | | |||||
* | | Merge pull request #2466 from rsim/fix_test_disable_referential_integrity | Aaron Patterson | 2011-08-08 | 1 | -0/+3 |
|\ \ | | | | | | | Fixed test_disable_referential_integrity on Oracle | ||||
| * | | Fixed test_disable_referential_integrity on Oracle | Raimonds Simanovskis | 2011-08-08 | 1 | -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 Sprockets | Santiago Pastorino | 2011-08-08 | 2 | -1/+2 |
| | | |||||
* | | Merge pull request #2448 from igrigorik/master | Joshua Peek | 2011-08-08 | 4 | -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 override | Ilya Grigorik | 2011-08-05 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'asset_hash_should_depend_on_env' | Ilya Grigorik | 2011-08-04 | 2 | -0/+14 |
| |\ \ | |||||
| | * | | generate environment dependent asset digests | Ilya Grigorik | 2011-08-04 | 2 | -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 Grigorik | 2011-08-04 | 2 | -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 Grigorik | 2011-08-04 | 2 | -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/master | Aaron Patterson | 2011-08-07 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | sqlite transactions in log files | ||||
| * | | | sqlite transactions now logged | Gustavo Delfino | 2011-08-06 | 1 | -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 anymore | Xavier Noria | 2011-08-07 | 2 | -47/+26 |
| | | | | |||||
* | | | | Merge pull request #2457 from Gregg/zombie_singular_fix | Xavier Noria | 2011-08-07 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Added irregular zombie inflection, so zombies != zomby | ||||
| * | | | | Added irregular zombie inflection, so zombies no longer gets singularized ↵ | Gregg Pollack | 2011-08-07 | 1 | -0/+1 |
|/ / / / | | | | | | | | | | | | | into zomby | ||||
* | | | | Merge pull request #2455 from vijaydev/patch-7 | Santiago Pastorino | 2011-08-07 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | Edit changelog to mention about x_sendfile_header default change | ||||
| * | | | | edit changelog to mention about x_sendfile_header default change | Vijay Dev | 2011-08-29 | 1 | -0/+2 |
|/ / / / | |||||
* | | | | x_sendfile_header now defaults to nil and production.rb env file doesn't | Santiago Pastorino | 2011-08-07 | 6 | -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é Valim | 2011-08-07 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge pull request #2450 from guilleiguaran/activesupport-gzip-1.8 | Santiago Pastorino | 2011-08-06 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Fix ActiveSupport::Gzip under Ruby 1.8.7. Closes #2416 | ||||
| * | | | Fix ActiveSupport::Gzip under Ruby 1.8.7. Closes #2416 | Guillermo Iguaran | 2011-08-06 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #2444 from elight/master | Santiago Pastorino | 2011-08-06 | 1 | -5/+11 |
|\ \ \ \ | | | | | | | | | | | Minor refactor to delegate | ||||
| * | | | | Refactored to more closely resemble idiom applied for on_nil | Evan Light | 2011-08-05 | 1 | -5/+11 |
| | | | | | |||||
* | | | | | Use rake >= 0.9.3.beta.1 in Ruby 1.9.3 | Santiago Pastorino | 2011-08-06 | 1 | -1/+6 |
|/ / / / | |||||
* | | | | Avoid generating app/views/layouts/application.html.erb on mountable ↵ | Santiago Pastorino | 2011-08-05 | 2 | -2/+0 |
| | | | | | | | | | | | | | | | | engines, just generate the namespaced one | ||||
* | | | | Revert "Test against Rubinius" | Aaron Patterson | 2011-08-05 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | This reverts commit 3cfbb3824436b2f8a37544b8ffe2f3a4605bc7c8. | ||||
* | | | | Merge pull request #2442 from sferik/test_on_rubinius | Aaron Patterson | 2011-08-05 | 1 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | Test against Rubinius | ||||
| * | | | | Test against Rubinius | Erik Michaels-Ober | 2011-08-05 | 1 | -1/+3 |
|/ / / / | | | | | | | | | | | | | Happy Rubinius Day! | ||||
* | | | | Revert "to_key on a destroyed model should return nil". Closes #2440 | Santiago Pastorino | 2011-08-05 | 2 | -4/+3 |
| | | | | | | | | | | | | | | | | This reverts commit c5448721b5054b8a467958d60427fdee15eac604. | ||||
* | | | | Fix test for Rubinius | Santiago Pastorino | 2011-08-05 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #2439 from guilleiguaran/fix-error-on-ar-tests-rbxday | Aaron Patterson | 2011-08-05 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Fix AR test suite error under Rubinius 2.0 #rbxday | ||||
| * | | | Fix AR test suite error under Rubinius 2.0 | Guillermo Iguaran | 2011-08-05 | 1 | -0/+1 |
| |/ / | |||||
* / / | pg does not allow aliases in the having clause, but functions are fine | Aaron Patterson | 2011-08-05 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'master' of github.com:rails/rails | Xavier Noria | 2011-08-04 | 1 | -2/+1 |
|\ \ |