aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1133 from joshk/options_merger_testJosé Valim2011-05-181-4/+4
|\ | | | | Fix misspelling of 'lambda'. Closes #987
| * Fix misspelling of 'lambda'. Closes #987Ben Orenstein2011-05-181-4/+4
|/
* Merge pull request #1132 from joshk/ares_changelogJosé Valim2011-05-181-4/+8
|\ | | | | Updated the ActiveResource changelog
| * updated the ActiveResource changelogJosh Kalderimis2011-05-181-4/+8
| |
* | Merge pull request #1131 from joshk/active_model_xml_fixJosé Valim2011-05-182-2/+8
|\ \ | |/ |/| Attributes with :string type should not be given the type passed in model. Closes #1058.
| * Attributes with :string type should not be given the type passed in model ↵Jim Herzberg2011-05-182-2/+8
|/ | | | serialization options. Closes #1058
* Merge pull request #1129 from amatsuda/pgsql_schema_query_formatSantiago Pastorino2011-05-181-1/+1
|\ | | | | on.upcase!
| * on.upcase!Akira Matsuda2011-05-191-1/+1
|/
* Merge pull request #1122 from amatsuda/postgres_schema_queriesAaron Patterson2011-05-181-26/+15
|\ | | | | improvements on PostgreSQL schema queries
| * why not use JOIN statement for joining tables? (vol. 2)Akira Matsuda2011-05-181-21/+12
| |
| * remove unused table from FROM clauseAkira Matsuda2011-05-181-2/+0
| | | | | | | | pg_namespace has not been used since this commit 29b0707f07f148d98515125dab44b73cfdc0a3d4
| * why not use JOIN statement for joining tables?Akira Matsuda2011-05-181-3/+3
| |
* | Merge pull request #1126 from sikachu/bump_rack_mountJosé Valim2011-05-181-1/+1
|\ \ | | | | | | Update Rack::Mount to 0.8.1
| * | Update Rack::Mount to 0.8.1Prem Sichanugrist2011-05-181-1/+1
| | |
* | | Merge pull request #1124 from amatsuda/fix_railties_warningsJosé Valim2011-05-1817-138/+138
|\ \ \ | |/ / |/| | Fix railties warnings
| * | be sure to parenthesize the arguments when the first one is a RegExp literalAkira Matsuda2011-05-1814-134/+133
| | | | | | | | | | | | | | | | | | this fixes: "warning: ambiguous first argument; put parentheses or even spaces" because: you need this to tell the parser that you're not calling :/ method (division) details (Japanese!): http://blade.nagaokaut.ac.jp/cgi-bin/vframe.rb/ruby/ruby-dev/42445?42370-43277
| * | parenthesize the arguments with splatAkira Matsuda2011-05-182-4/+4
| | | | | | | | | | | | to make sure we're not calling the :* operator
| * | initialize @inside_templateAkira Matsuda2011-05-181-0/+1
|/ / | | | | | | fixes: "warning: instance variable @inside_template not initialized"
* | Merge pull request #1115 from joshk/active_resource_json_updatesJosé Valim2011-05-1822-407/+431
|\ \ | | | | | | ActiveResource json updates
| * | 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
|\ \ \ | | | | | | | | change `for ... in` in the generator templates to Enumerator#each
| * | | for ... in => .eachAkira Matsuda2011-05-187-10/+10
| | | | | | | | | | | | | | | | I believe this is more modern way
* | | | 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 #1038
| * | | | 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 gem
| * | | 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
|\ \ | | | | | | add test case for turn gem for testunit.
| * | 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 ↵Teng Siong Ong2011-05-182-1/+15
| | | | | | | | | | | | used as long as RUBY_VERSION > '1.9'.
| * | 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
| * Putting back mysql2 and sqlite3 in database.yml docs. In case people use ↵Arun Agrawal2011-05-182-0/+5
|/ | | | "--skip-gemfile"
* 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
|\ | | | | Performance tests improved
| * 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 ↵Gonçalo Silva2011-05-101-0/+1
| |\ | | | | | | | | | performance_test
| | * benchmarker and profiler now use the new performance testing tools (support ↵Gonçalo Silva2011-05-104-95/+83
| | | | | | | | | | | | for Rubinius and JRuby and high configurability)
| * | benchmarker and profiler now use the new performance testing tools (support ↵Gonçalo Silva2011-05-104-95/+82
| |/ | | | | | | for Rubinius and JRuby and high configurability)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 13:00:26 +0000