Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | initialize @inside_template | Akira Matsuda | 2011-05-18 | 1 | -0/+1 |
| | | | | fixes: "warning: instance variable @inside_template not initialized" | ||||
* | Merge pull request #1115 from joshk/active_resource_json_updates | José Valim | 2011-05-18 | 22 | -407/+431 |
|\ | | | | | ActiveResource json updates | ||||
| * | corrected some further tests and docs for the ARes change to json change | Josh Kalderimis | 2011-05-18 | 7 | -108/+108 |
| | | |||||
| * | removed a contrived ARes example | Josh Kalderimis | 2011-05-18 | 1 | -15/+0 |
| | | |||||
| * | updated all the tests in ARes to work with json | Josh Kalderimis | 2011-05-18 | 18 | -283/+324 |
| | | |||||
| * | move the ARes conn test to the correct location | Josh Kalderimis | 2011-05-18 | 1 | -5/+5 |
| | | |||||
| * | remove a circular dependency | Josh Kalderimis | 2011-05-18 | 1 | -2/+0 |
| | | |||||
* | | Merge pull request #1123 from amatsuda/generator_for_to_each | José Valim | 2011-05-18 | 7 | -10/+10 |
|\ \ | | | | | | | change `for ... in` in the generator templates to Enumerator#each | ||||
| * | | for ... in => .each | Akira Matsuda | 2011-05-18 | 7 | -10/+10 |
| | | | | | | | | | | | | I believe this is more modern way | ||||
* | | | Merge pull request #1117 from joshk/as_numeric_time | José Valim | 2011-05-18 | 2 | -0/+3 |
|\ \ \ | | | | | | | | | Add some missing requires for AS core_ext/numeric/time. Closes #1038 | ||||
| * | | | add some missing requires for AS core_ext/numeric/time. Closes #1038 | Josh Kalderimis | 2011-05-18 | 2 | -0/+3 |
| | | | | |||||
* | | | | Merge pull request #1116 from guilleiguaran/typo_in_app_generator_test | José Valim | 2011-05-18 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Fixing typo in test for turn gem | ||||
| * | | | Fixing typo in test for turn gem | Guillermo Iguaran | 2011-05-18 | 1 | -1/+1 |
| |/ / | |||||
* / / | set log encoding to BINARY, but still use text mode to output portable newlines | Xavier Noria | 2011-05-18 | 1 | -6/+9 |
|/ / | |||||
* | | Merge pull request #1112 from FLOChip/turn | José Valim | 2011-05-17 | 2 | -2/+31 |
|\ \ | | | | | | | add test case for turn gem for testunit. | ||||
| * | | don't include 'turn' gem in Gemfile if test unit is skipped. | Teng Siong Ong | 2011-05-18 | 2 | -1/+8 |
| | | | |||||
| * | | add tests for ruby-debug gem in Gemfile and make sure that ruby-debug19 is ↵ | Teng Siong Ong | 2011-05-18 | 2 | -1/+15 |
| | | | | | | | | | | | | used as long as RUBY_VERSION > '1.9'. | ||||
| * | | add test case for turn gem for testunit. | siong1987 | 2011-05-18 | 1 | -0/+8 |
| |/ | |||||
* | | Merge pull request #1114 from arunagw/databaseyml_doc | José Valim | 2011-05-17 | 2 | -0/+5 |
|\ \ | |/ |/| | Putting back mysql2 and sqlite3 in database.yml docs. In case people use | ||||
| * | Putting back mysql2 and sqlite3 in database.yml docs. In case people use ↵ | Arun Agrawal | 2011-05-18 | 2 | -0/+5 |
|/ | | | | "--skip-gemfile" | ||||
* | Add missing require | Santiago Pastorino | 2011-05-17 | 1 | -0/+1 |
| | |||||
* | Run bundle install once when using plugin_new --full --mountable. Closes #555 | Santiago Pastorino | 2011-05-17 | 2 | -0/+6 |
| | |||||
* | bumping arel requirement | Aaron Patterson | 2011-05-17 | 1 | -1/+1 |
| | |||||
* | Ensure Set-Cookie is not set on assets. | José Valim | 2011-05-17 | 2 | -25/+27 |
| | |||||
* | Don't pass a block as we are yielding | Andrew White | 2011-05-17 | 1 | -1/+1 |
| | |||||
* | Dump and load rack-cache stuff. | José Valim | 2011-05-17 | 2 | -2/+27 |
| | |||||
* | Merge pull request #247 from goncalossilva/performance_test | Jeremy Kemper | 2011-05-17 | 12 | -556/+966 |
|\ | | | | | Performance tests improved | ||||
| * | removed redundant metric support check (and print when it isn't) | Gonçalo Silva | 2011-05-10 | 2 | -6/+6 |
| | | |||||
| * | remove forgotten puts | Gonçalo Silva | 2011-05-10 | 1 | -1/+0 |
| | | |||||
| * | ruby-prof's awesome call stack printer is now used by default | Gonçalo Silva | 2011-05-10 | 2 | -2/+2 |
| | | |||||
| * | Merge branch 'performance_test' of github.com:goncalossilva/rails into ↵ | Gonçalo Silva | 2011-05-10 | 1 | -0/+1 |
| |\ | | | | | | | | | | performance_test | ||||
| | * | benchmarker and profiler now use the new performance testing tools (support ↵ | Gonçalo Silva | 2011-05-10 | 4 | -95/+83 |
| | | | | | | | | | | | | for Rubinius and JRuby and high configurability) | ||||
| * | | benchmarker and profiler now use the new performance testing tools (support ↵ | Gonçalo Silva | 2011-05-10 | 4 | -95/+82 |
| |/ | | | | | | | for Rubinius and JRuby and high configurability) | ||||
| * | fixed a typo in the guide | Gonçalo Silva | 2011-05-09 | 1 | -2/+2 |
| | | |||||
| * | contemplate unsupported metrics | Gonçalo Silva | 2011-05-09 | 3 | -30/+18 |
| | | |||||
| * | added a note about profiling options to the generators | Gonçalo Silva | 2011-05-09 | 2 | -2/+8 |
| | | |||||
| * | explicitly return from run() under minitest (metrics were printed with the ↵ | Gonçalo Silva | 2011-05-08 | 2 | -1/+3 |
| | | | | | | | | previous solution) | ||||
| * | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-05-08 | 371 | -22008/+7586 |
| |\ | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/testing/performance.rb | ||||
| * \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-04-17 | 323 | -5204/+4286 |
| |\ \ | |||||
| * | | | don't use internal profiler methods on Rubinius and JRuby since we're only ↵ | Gonçalo Silva | 2011-04-03 | 3 | -8/+14 |
| | | | | | | | | | | | | | | | | measuring wall clock for now (and the APIs will/can change, respectively) | ||||
| * | | | removed unused class declaration | Gonçalo Silva | 2011-04-03 | 1 | -2/+0 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-04-03 | 31 | -105/+275 |
| |\ \ \ | |||||
| * | | | | profiling enabled under JRuby. Added documentation for workaround described ↵ | Gonçalo Silva | 2011-04-03 | 5 | -20/+9 |
| | | | | | | | | | | | | | | | | | | | | in JRUBY-5650. | ||||
| * | | | | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-03-30 | 35 | -72/+494 |
| |\ \ \ \ | |||||
| * | | | | | updated documentation because of the benchmark/profile improvements | Gonçalo Silva | 2011-03-30 | 1 | -49/+134 |
| | | | | | | |||||
| * | | | | | check if there is support for the specified metric when profiling | Gonçalo Silva | 2011-03-30 | 4 | -24/+32 |
| | | | | | | |||||
| * | | | | | fixed a bug where rubinius was creating the profiling files as directories | Gonçalo Silva | 2011-03-30 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | don't allow decimal places on the amount of objects and gc runs | Gonçalo Silva | 2011-03-29 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | performance tests inherit from AD::PT and not AC::PT, fixed performance test ↵ | Gonçalo Silva | 2011-03-29 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | generator invocation (guide) | ||||
| * | | | | | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-03-28 | 43 | -79/+479 |
| |\ \ \ \ \ |