Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge pull request #6119 from romanvbabenko/refactor/checking_rubygems_presence | Jeremy Kemper | 2012-05-02 | 2 | -19/+15 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Gem const presence checking has been removed | |||||
| * | | | | | | | | | Gem cont presence checking has been removed | Roman V. Babenko | 2012-05-02 | 2 | -19/+15 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #6116 from romanvbabenko/refactor/executable_rakefiles | Jeremy Kemper | 2012-05-02 | 9 | -8/+0 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Rakefile executable attributes and shebang lines has been removed | |||||
| * | | | | | | | | | | Rakefile executable attributes and shebang lines has been removed | Roman V. Babenko | 2012-05-02 | 9 | -8/+0 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #6121 from bogdan/routes | José Valim | 2012-05-02 | 1 | -26/+4 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | ActionPack routes: remove some useless code. | |||||
| * | | | | | | | | | ActionPack routes: remove some useless code. | Bogdan Gusiev | 2012-05-02 | 1 | -26/+4 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #6120 from arunagw/build_fix_master_railties | José Valim | 2012-05-02 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix build for railties generators | |||||
| * | | | | | | | | | Fix build for railties generators | Arun Agrawal | 2012-05-02 | 2 | -3/+3 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #6118 from arunagw/build_fix_master | José Valim | 2012-05-02 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | build fix for SharedGeneratorTests | |||||
| * | | | | | | | | build fix for SharedGeneratorTests | Arun Agrawal | 2012-05-02 | 1 | -2/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #6040 from Paymium/issue-6033 | José Valim | 2012-05-02 | 3 | -1/+28 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | BigDecimal string wrapping in JSON serialization can now be opted-out | |||||
| * | | | | | | | | BigDecimal string wrapping in JSON serialization can now be opted-out, fixes ↵ | David FRANCOIS | 2012-05-02 | 3 | -1/+28 | |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | #6033 | |||||
* | | | | | | | | Merge pull request #5962 from bogdan/routes | José Valim | 2012-05-02 | 1 | -18/+0 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Remove tests for undocumented private methods | |||||
| * | | | | | | | | ActionPack: remove tests for hash_for_* methods | Bogdan Gusiev | 2012-05-02 | 1 | -18/+0 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #6111 from oscardelben/new_hash_syntax_in_gemfile | José Valim | 2012-05-02 | 1 | -14/+14 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Use new hash syntax in generated Gemfile | |||||
| * | | | | | | | Use new hash syntax in generated Gemfile | Oscar Del Ben | 2012-05-02 | 1 | -14/+14 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #6109 from carlosantoniodasilva/fix-build | Santiago Pastorino | 2012-05-01 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Build fix for plugin new generator change | |||||
| * | | | | | | | Build fix for plugin new generator change | Carlos Antonio da Silva | 2012-05-01 | 1 | -2/+2 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Related to a06a84bf77082a7435973fa1b6c8254fb410f243 | |||||
* | | | | | | | Merge pull request #4345 from sunaku/patch-1 | Santiago Pastorino | 2012-05-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | gemspec assumes that user kept all generated files | |||||
| * | | | | | | | gemspec assumes that user kept all generated files | Suraj N. Kurapati | 2012-01-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit allows the user be lazy and not update their gemspec's `files` directive after deleting unwanted files from their generated Rails plugin. | |||||
* | | | | | | | | Fix tests | Piotr Sarnacki | 2012-05-01 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | Use :github option in Gemfile and make hashes consistent | Piotr Sarnacki | 2012-05-01 | 2 | -17/+17 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #6102 from rodrei/remove_unused_vars | José Valim | 2012-05-01 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Removing unused local vars in Queue tests | |||||
| * | | | | | | | | Removing unused local vars in Queue tests | Rodrigo Pavano | 2012-05-01 | 1 | -2/+0 | |
| | | | | | | | | | ||||||
* | | | | | | | | | copy-edit guide [ci skip] | Vijay Dev | 2012-05-02 | 1 | -2/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | remove unused pguides rake task from railties | Vijay Dev | 2012-05-02 | 1 | -9/+0 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #6096 from ↵ | Piotr Sarnacki | 2012-05-01 | 2 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hasclass/as_json__encode_infinite_and_nan_bigdecimals_as_null JSON: encode BigDecimal NaN/Infinity as null. | |||||
| * | | | | | | | | | JSON: encode BigDecimal NaN/Infinity as null. | Sebi Burkhard | 2012-05-01 | 2 | -1/+4 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #6089 from frodsan/delete_all_limit | Aaron Patterson | 2012-05-01 | 2 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | delete_all raise an error if a limit is provided - fixes #4979 | |||||
| * | | | | | | | | | delete_all raise an error if a limit is provided - fixes #4979 | Francesco Rodriguez | 2012-04-30 | 2 | -0/+6 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #6092 from ↵ | Aaron Patterson | 2012-05-01 | 2 | -1/+25 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jsanders/issue_4001_error_typecasting_non_integer_castable Don't type cast values that don't respond to to_i to 1 | |||||
| * | | | | | | | | | Don't type cast values that don't respond to to_i to 1 | James Sanders & Jason Noble | 2012-04-30 | 2 | -1/+25 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | changelog fixes. Closes #3911 | Vijay Dev | 2012-05-01 | 1 | -13/+0 | |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
* | | | | | | | | | more edits [ci skip] | Vijay Dev | 2012-05-01 | 2 | -2/+2 | |
| | | | | | | | | | ||||||
* | | | | | | | | | copy edit AS deprecation/behaviours docs [ci skip] | Vijay Dev | 2012-05-01 | 1 | -22/+11 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-01 | 30 | -494/+167 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Revert "Added Short 1 line note about connection pools. " | Vijay Dev | 2012-05-01 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c3954baee92446219606621c1b185360553a6d5d. | |||||
| * | | | | | | | | Merge pull request #95 from RobZolkos/add_doc_for_utc_offset | Vijay Dev | 2012-05-01 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add documention for utc_offset method | |||||
| | * | | | | | | | | Add documention for utc_offset method | Rob Zolkos | 2012-05-01 | 1 | -0/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add line which gives a little bit more information how *_will_change! works. | Edward Tsech | 2012-05-01 | 1 | -0/+1 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Bump Rails version in action mailer guide. | Oscar Del Ben | 2012-05-01 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Oscar Del Ben | 2012-05-01 | 3 | -10/+13 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Minor English fix. | Erich Menge | 2012-04-30 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Added Short 1 line note about connection pools. | Gaurish Sharma | 2012-04-30 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I hope its okay to add this here. if not, then please revert back. | |||||
| | * | | | | | | | | add ActiveRecord::RecordInvalid to exceptions | Hrvoje Šimić | 2012-04-30 | 1 | -9/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sort the exception names alphabetically | |||||
| * | | | | | | | | | Getting Started Guide Code Cleanup | Oscar Del Ben | 2012-05-01 | 2 | -10/+1 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Oscar Del Ben | 2012-04-30 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Rails 4.0 upgrade note for the ConfirmationValidator change | Brian Cardarella | 2012-04-30 | 1 | -0/+4 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Rewrite adding a second model section of Getting Started Guide | Oscar Del Ben | 2012-04-30 | 4 | -39/+42 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Fix stray capitalization | Mark Rushakoff | 2012-04-29 | 1 | -1/+1 | |
| | | | | | | | | |