Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use sprockets prepend_path if its available | Joshua Peek | 2011-05-19 | 1 | -3/+9 |
| | |||||
* | Implement proxy_owner, proxy_target and proxy_reflection methods on ↵ | Jon Leighton | 2011-05-19 | 3 | -5/+42 |
| | | | | CollectionProxy with deprecations. Fixes #1148. | ||||
* | Merge pull request #1153 from arunagw/sprockets_update | Santiago Pastorino | 2011-05-19 | 1 | -1/+1 |
|\ | | | | | Sprockets version update. | ||||
| * | Sprockets version update. | Arun Agrawal | 2011-05-19 | 1 | -1/+1 |
|/ | |||||
* | Use Rack::ContentLength. | José Valim | 2011-05-19 | 2 | -5/+8 |
| | |||||
* | Merge pull request #1097 from kirillrdy/master | Michael Koziarski | 2011-05-19 | 1 | -1/+1 |
|\ | | | | | Improved "treat 0000-00-00 00:00:00 as nil Date" | ||||
| * | Year 0 should fall to nil only if month and day are also 0 | Kirill Radzikhovskyy | 2011-05-17 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1118 from amatsuda/pp_console | Michael Koziarski | 2011-05-19 | 1 | -0/+1 |
|\ \ | | | | | | | always enable `pp` on the Rails console | ||||
| * | | always enable `pp` on the Rails console | Akira Matsuda | 2011-05-18 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #1151 from joshk/wrap_params_options_change | José Valim | 2011-05-19 | 3 | -26/+26 |
|\ \ \ | | | | | | | | | renamed the wrap_parameters :only and :except options to :include and :ex | ||||
| * | | | renamed the wrap_parameters :only and :except options to :include and ↵ | Josh Kalderimis | 2011-05-19 | 3 | -26/+26 |
| | | | | | | | | | | | | | | | | :exclude to make it consistent with controller filters | ||||
* | | | | Merge pull request #1150 from stevenbristol/master | Joshua Peek | 2011-05-19 | 2 | -7/+11 |
|\ \ \ \ | |/ / / |/| | | | The cookie jar does not to_s cookie names (keys) | ||||
| * | | | adding test | steve | 2011-05-19 | 1 | -4/+8 |
| | | | | |||||
| * | | | fixing sym and string cookie name, two cookies to browser bug. | steve | 2011-05-19 | 1 | -3/+3 |
|/ / / | |||||
* | | | Merge pull request #1137 from guilleiguaran/each_syntax_in_activemodel | José Valim | 2011-05-19 | 1 | -3/+1 |
|\ \ \ | | | | | | | | | Prefer 'each' instead of 'for in' | ||||
| * | | | Prefer each instead of for in | Guillermo Iguaran | 2011-05-19 | 1 | -3/+1 |
| | | | | |||||
* | | | | Merge pull request #1136 from arunagw/actionmailer_readme | José Valim | 2011-05-19 | 4 | -13/+13 |
|\ \ \ \ | | | | | | | | | | | Actionmailer readme | ||||
| * | | | | Example Usage updated for actionpack and actionmailer. | Arun Agrawal | 2011-05-19 | 4 | -13/+13 |
| | | | | | |||||
* | | | | | Merge pull request #1135 from arunagw/for_to_each | José Valim | 2011-05-19 | 1 | -3/+3 |
|\| | | | | |/ / / |/| | | | README updated for for => each | ||||
| * | | | README updated for for => each | Arun Agrawal | 2011-05-19 | 1 | -3/+3 |
|/ / / | |||||
* | | | Merge pull request #1109 from dlee/optimize_indifferent_access | José Valim | 2011-05-18 | 2 | -2/+3 |
|\ \ \ | | | | | | | | | Use dup to preserve previous behavior | ||||
| * | | | Test that HWIA.with_indifferent_access does not return self | David Lee | 2011-05-17 | 1 | -0/+1 |
| | | | | |||||
| * | | | Use dup to preserve previous behavior | David Lee | 2011-05-17 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-18 | 7 | -21/+23 |
|\ \ \ \ | |||||
| * | | | | Explicitly use ActiveRecord::IrreversibleMigration | Malcolm Locke | 2011-05-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Prevent duplicable comments from being the opening paragraph for Object docs | Evan Farrar | 2011-05-18 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Better doc styling in ActiveRecord::Locking | Sebastian Martinez | 2011-05-17 | 2 | -17/+17 |
| | | | | | |||||
| * | | | | fix coding error in readme reported in rails GH #980 | Vijay Dev | 2011-05-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Link changes lighthouse to github | Arun Agrawal | 2011-05-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Mailer example has more sense calling to deliver method | Guillermo Iguaran | 2011-05-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1133 from joshk/options_merger_test | José Valim | 2011-05-18 | 1 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix misspelling of 'lambda'. Closes #987 | ||||
| * | | | | | Fix misspelling of 'lambda'. Closes #987 | Ben Orenstein | 2011-05-18 | 1 | -4/+4 |
|/ / / / / | |||||
* | | | | | Merge pull request #1132 from joshk/ares_changelog | José Valim | 2011-05-18 | 1 | -4/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Updated the ActiveResource changelog | ||||
| * | | | | | updated the ActiveResource changelog | Josh Kalderimis | 2011-05-18 | 1 | -4/+8 |
| | | | | | | |||||
* | | | | | | Merge pull request #1131 from joshk/active_model_xml_fix | José Valim | 2011-05-18 | 2 | -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 Herzberg | 2011-05-18 | 2 | -2/+8 |
|/ / / / / | | | | | | | | | | | | | | | | serialization options. Closes #1058 | ||||
* | | | | | Merge pull request #1129 from amatsuda/pgsql_schema_query_format | Santiago Pastorino | 2011-05-18 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | on.upcase! | ||||
| * | | | | | on.upcase! | Akira Matsuda | 2011-05-19 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #1122 from amatsuda/postgres_schema_queries | Aaron Patterson | 2011-05-18 | 1 | -26/+15 |
|\ \ \ \ \ | | | | | | | | | | | | | improvements on PostgreSQL schema queries | ||||
| * | | | | | why not use JOIN statement for joining tables? (vol. 2) | Akira Matsuda | 2011-05-18 | 1 | -21/+12 |
| | | | | | | |||||
| * | | | | | remove unused table from FROM clause | Akira Matsuda | 2011-05-18 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | pg_namespace has not been used since this commit 29b0707f07f148d98515125dab44b73cfdc0a3d4 | ||||
| * | | | | | why not use JOIN statement for joining tables? | Akira Matsuda | 2011-05-18 | 1 | -3/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #1126 from sikachu/bump_rack_mount | José Valim | 2011-05-18 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Update Rack::Mount to 0.8.1 | ||||
| * | | | | | Update Rack::Mount to 0.8.1 | Prem Sichanugrist | 2011-05-18 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #1124 from amatsuda/fix_railties_warnings | José Valim | 2011-05-18 | 17 | -138/+138 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix railties warnings | ||||
| * | | | | | be sure to parenthesize the arguments when the first one is a RegExp literal | Akira Matsuda | 2011-05-18 | 14 | -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 splat | Akira Matsuda | 2011-05-18 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | to make sure we're not calling the :* operator | ||||
| * | | | | | 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 |
| | | | | | |