aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* parenthesize the arguments with splatAkira Matsuda2011-05-182-4/+4
* initialize @inside_templateAkira Matsuda2011-05-181-0/+1
* Merge pull request #1115 from joshk/active_resource_json_updatesJosé Valim2011-05-1822-407/+431
|\
| * corrected some further tests and docs for the ARes change to json changeJosh Kalderimis2011-05-187-108/+108
| * removed a contrived ARes exampleJosh Kalderimis2011-05-181-15/+0
| * updated all the tests in ARes to work with jsonJosh Kalderimis2011-05-1818-283/+324
| * move the ARes conn test to the correct locationJosh Kalderimis2011-05-181-5/+5
| * remove a circular dependencyJosh Kalderimis2011-05-181-2/+0
* | Merge pull request #1123 from amatsuda/generator_for_to_eachJosé Valim2011-05-187-10/+10
|\ \
| * | for ... in => .eachAkira Matsuda2011-05-187-10/+10
* | | Merge pull request #1117 from joshk/as_numeric_timeJosé Valim2011-05-182-0/+3
|\ \ \
| * | | add some missing requires for AS core_ext/numeric/time. Closes #1038Josh Kalderimis2011-05-182-0/+3
* | | | Merge pull request #1116 from guilleiguaran/typo_in_app_generator_testJosé Valim2011-05-181-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixing typo in test for turn gemGuillermo Iguaran2011-05-181-1/+1
| |/ /
* / / set log encoding to BINARY, but still use text mode to output portable newlinesXavier Noria2011-05-181-6/+9
|/ /
* | Merge pull request #1112 from FLOChip/turnJosé Valim2011-05-172-2/+31
|\ \
| * | don't include 'turn' gem in Gemfile if test unit is skipped.Teng Siong Ong2011-05-182-1/+8
| * | add tests for ruby-debug gem in Gemfile and make sure that ruby-debug19 is us...Teng Siong Ong2011-05-182-1/+15
| * | add test case for turn gem for testunit.siong19872011-05-181-0/+8
| |/
* | Merge pull request #1114 from arunagw/databaseyml_docJosé Valim2011-05-172-0/+5
|\ \ | |/ |/|
| * Putting back mysql2 and sqlite3 in database.yml docs. In case people use "--s...Arun Agrawal2011-05-182-0/+5
|/
* Add missing requireSantiago Pastorino2011-05-171-0/+1
* Run bundle install once when using plugin_new --full --mountable. Closes #555Santiago Pastorino2011-05-172-0/+6
* bumping arel requirementAaron Patterson2011-05-171-1/+1
* Ensure Set-Cookie is not set on assets.José Valim2011-05-172-25/+27
* Don't pass a block as we are yieldingAndrew White2011-05-171-1/+1
* Dump and load rack-cache stuff.José Valim2011-05-172-2/+27
* Merge pull request #247 from goncalossilva/performance_testJeremy Kemper2011-05-1712-556/+966
|\
| * removed redundant metric support check (and print when it isn't)Gonçalo Silva2011-05-102-6/+6
| * remove forgotten putsGonçalo Silva2011-05-101-1/+0
| * ruby-prof's awesome call stack printer is now used by defaultGonçalo Silva2011-05-102-2/+2
| * Merge branch 'performance_test' of github.com:goncalossilva/rails into perfor...Gonçalo Silva2011-05-101-0/+1
| |\
| | * benchmarker and profiler now use the new performance testing tools (support f...Gonçalo Silva2011-05-104-95/+83
| * | benchmarker and profiler now use the new performance testing tools (support f...Gonçalo Silva2011-05-104-95/+82
| |/
| * fixed a typo in the guideGonçalo Silva2011-05-091-2/+2
| * contemplate unsupported metricsGonçalo Silva2011-05-093-30/+18
| * added a note about profiling options to the generatorsGonçalo Silva2011-05-092-2/+8
| * explicitly return from run() under minitest (metrics were printed with the pr...Gonçalo Silva2011-05-082-1/+3
| * Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-05-08371-22008/+7586
| |\
| * \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-04-17323-5204/+4286
| |\ \
| * | | don't use internal profiler methods on Rubinius and JRuby since we're only me...Gonçalo Silva2011-04-033-8/+14
| * | | removed unused class declarationGonçalo Silva2011-04-031-2/+0
| * | | Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-04-0331-105/+275
| |\ \ \
| * | | | profiling enabled under JRuby. Added documentation for workaround described i...Gonçalo Silva2011-04-035-20/+9
| * | | | Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-03-3035-72/+494
| |\ \ \ \
| * | | | | updated documentation because of the benchmark/profile improvementsGonçalo Silva2011-03-301-49/+134
| * | | | | check if there is support for the specified metric when profilingGonçalo Silva2011-03-304-24/+32
| * | | | | fixed a bug where rubinius was creating the profiling files as directoriesGonçalo Silva2011-03-301-1/+1
| * | | | | don't allow decimal places on the amount of objects and gc runsGonçalo Silva2011-03-291-1/+1
| * | | | | performance tests inherit from AD::PT and not AC::PT, fixed performance test ...Gonçalo Silva2011-03-291-6/+6