aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* renamed the wrap_parameters :only and :except options to :include and ↵Josh Kalderimis2011-05-193-26/+26
| | | | :exclude to make it consistent with controller filters
* Merge pull request #1137 from guilleiguaran/each_syntax_in_activemodelJosé Valim2011-05-191-3/+1
|\ | | | | Prefer 'each' instead of 'for in'
| * Prefer each instead of for inGuillermo Iguaran2011-05-191-3/+1
| |
* | Merge pull request #1136 from arunagw/actionmailer_readmeJosé Valim2011-05-194-13/+13
|\ \ | | | | | | Actionmailer readme
| * | Example Usage updated for actionpack and actionmailer.Arun Agrawal2011-05-194-13/+13
| | |
* | | Merge pull request #1135 from arunagw/for_to_eachJosé Valim2011-05-191-3/+3
|\| | | |/ |/| README updated for for => each
| * README updated for for => eachArun Agrawal2011-05-191-3/+3
|/
* Merge pull request #1109 from dlee/optimize_indifferent_accessJosé Valim2011-05-182-2/+3
|\ | | | | Use dup to preserve previous behavior
| * Test that HWIA.with_indifferent_access does not return selfDavid Lee2011-05-171-0/+1
| |
| * Use dup to preserve previous behaviorDavid Lee2011-05-172-2/+2
| |
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-187-21/+23
|\ \
| * | Explicitly use ActiveRecord::IrreversibleMigrationMalcolm Locke2011-05-181-1/+1
| | |
| * | Prevent duplicable comments from being the opening paragraph for Object docsEvan Farrar2011-05-181-0/+2
| | |
| * | Better doc styling in ActiveRecord::LockingSebastian Martinez2011-05-172-17/+17
| | |
| * | fix coding error in readme reported in rails GH #980Vijay Dev2011-05-171-1/+1
| | |
| * | Link changes lighthouse to githubArun Agrawal2011-05-161-1/+1
| | |
| * | Mailer example has more sense calling to deliver methodGuillermo Iguaran2011-05-151-1/+1
| | |
* | | 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
| | | | |