Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | We actually don't need a reverse_merge! here. dup removed was giving error ↵ | Arun Agrawal | 2011-08-12 | 1 | -1/+1 |
| | | | | with nil class. | ||||
* | Merge pull request #2497 from akaspick/url_for_fix | Santiago Pastorino | 2011-08-11 | 2 | -1/+13 |
|\ | | | | | When calling url_for with a hash, additional (likely unwanted) values (such as :host) would be returned in the hash | ||||
| * | when calling url_for with a hash, additional (likely unwanted) values (such ↵ | Andrew Kaspick | 2011-08-11 | 2 | -1/+13 |
|/ | | | | as :host) would be returned in the hash... calling #dup on the hash prevents this | ||||
* | Merge pull request #2489 from grzuy/master | Santiago Pastorino | 2011-08-11 | 1 | -4/+4 |
|\ | | | | | Remove parameters_for_url from form_tag method header | ||||
| * | Remove 'parameters_for_url' parameter from 'form_tag' method signature | Gonzalo Rodriguez and Leonardo Capillera | 2011-08-10 | 1 | -4/+4 |
|/ | | | | | If you use that parameter it will end calling to url_for with two arguments, which fails because url_for expects only one | ||||
* | add the gem requirement for sqlite3 | Aaron Patterson | 2011-08-10 | 1 | -0/+2 |
| | |||||
* | Remove lame comment. | José Valim | 2011-08-09 | 1 | -1/+0 |
| | |||||
* | rake assets:precompile defaults to production env | Santiago Pastorino | 2011-08-09 | 1 | -0/+1 |
| | |||||
* | adding missing require to fist railties tests | Aaron Patterson | 2011-08-09 | 1 | -0/+2 |
| | |||||
* | Okay, the new incompatible arel is now called 2.2 and the sun shines upon ↵ | Jon Leighton | 2011-08-09 | 1 | -1/+1 |
| | | | | thee once more | ||||
* | Merge pull request #2465 from pivotal-casebook/patch-3 | Aaron Patterson | 2011-08-09 | 1 | -0/+2 |
|\ | | | | | Further monkey-patching to avoid deprecation warnings | ||||
| * | Further monkey-patching to avoid deprecation warnings | Pivotal Casebook | 2011-08-08 | 1 | -0/+2 |
| | | |||||
* | | deprecating process_view_paths | Aaron Patterson | 2011-08-09 | 5 | -4/+6 |
| | | |||||
* | | avoid object creation via useless duping and freezing | Aaron Patterson | 2011-08-09 | 1 | -3/+2 |
| | | |||||
* | | just use map and case / when rather than modifying the iterating array | Aaron Patterson | 2011-08-09 | 1 | -5/+8 |
| | | |||||
* | | only typecast what we need to typecast | Aaron Patterson | 2011-08-09 | 1 | -11/+9 |
| | | |||||
* | | Favor composition over inheritance. | Aaron Patterson | 2011-08-09 | 1 | -6/+48 |
| | | |||||
* | | 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 |
|/ / / / |