Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #3657 from arunagw/mysql2_bump_master | José Valim | 2011-11-28 | 2 | -2/+2 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Bump Mysql2! | |||||
| * | | | | | | Bump Mysql2! | Arun Agrawal | 2011-11-22 | 2 | -2/+2 | |
| | | | | | | | ||||||
* | | | | | | | Revert "use any? to check for size" | Vijay Dev | 2011-11-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c4af5f00f602b9e1c3166872902265836daf321b. | |||||
* | | | | | | | Revert "Use any instead of length" | José Valim | 2011-11-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1756629835d39f60ef4c96aff81ac503c71b98b7. | |||||
* | | | | | | | Revert "Used any? instead of length call" | Xavier Noria | 2011-11-28 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: This is slower, and any? is not equivalent in the general case. See discussion in https://github.com/rails/rails/pull/3779 This reverts commit 20cbf8eddc3844126d20f1218f068889d17b0dcf. | |||||
* | | | | | | | Merge pull request #3776 from nashby/add-namespace-to-form | José Valim | 2011-11-27 | 3 | -2/+95 | |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | add namespace options to form_for | |||||
| * | | | | | | update CHANGELOG | Vasiliy Ermolovich | 2011-11-28 | 1 | -0/+10 | |
| | | | | | | | ||||||
| * | | | | | | add namespace options to form_for | Vasiliy Ermolovich | 2011-11-27 | 2 | -2/+85 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can provide a namespace for your form to ensure uniqueness of id attributes on form elements. The namespace attribute will be prefixed with underscore on the generate HTML id | |||||
* | | | | | | | Merge pull request #3779 from rahul100885/rahul100885_work | José Valim | 2011-11-27 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Used any? instead of length call | |||||
| * | | | | | | | Used any? instead of length call | Rahul P. Chaudhari | 2011-11-28 | 2 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #3748 from samsonasu/has_many_custom_pk_new_record | Jon Leighton | 2011-11-27 | 3 | -2/+33 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | New records should load has_many relationships with custom primary keys | |||||
| * | | | | | | | load has_many associations keyed off a custom primary key if that key is ↵ | Brian Samson | 2011-11-25 | 3 | -2/+33 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | present but the record is unsaved | |||||
* | | | | | | | | Merge pull request #3773 from rahul100885/rahul100885_work | Santiago Pastorino | 2011-11-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Use any instead of length | |||||
| * | | | | | | | | Use any instead of length | Rahul P. Chaudhari | 2011-11-27 | 1 | -1/+1 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #3771 from kennyj/fix_rake_test_warnings | José Valim | 2011-11-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Call a block passed rake_tasks method in the self context | |||||
| * | | | | | | | Call a block passed rake_tasks method in the self context | kennyj | 2011-11-27 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #3769 from kennyj/fix_index_html | José Valim | 2011-11-27 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | avoid url started with "/" for the rails.png in public/index.html | |||||
| * | | | | | | | avoid absolute path for the rails.png in index.html | kennyj | 2011-11-27 | 2 | -1/+2 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #3772 from lest/label-with-block | José Valim | 2011-11-27 | 3 | -2/+13 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | fix label with block in erb | |||||
| * | | | | | | fix label with block in erb | lest | 2011-11-27 | 3 | -2/+13 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3767 from tadast/object_in | Yehuda Katz | 2011-11-26 | 2 | -7/+27 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Object#in? also accepts multiple parameters | |||||
| * | | | | | | Object#in? also accepts multiple parameters | Tadas Tamošauskas | 2011-11-26 | 2 | -7/+27 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #3765 from qoobaa/orm-instance-fix | José Valim | 2011-11-26 | 2 | -1/+39 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | added tests to #3763 | |||||
| * | | | | | | | added tests, replaced classify with constantize - using classify here cuts ↵ | Jakub Kuźma | 2011-11-26 | 2 | -1/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the last 's' in ORM name | |||||
* | | | | | | | | Merge pull request #3763 from qoobaa/orm-instance-fix | José Valim | 2011-11-26 | 1 | -1/+1 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | allow using orm_instance without invoking orm_class in generators | |||||
| * | | | | | | | allow using orm_instance without invoking orm_class first in generators | Jakub Kuźma | 2011-11-26 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | add more tests for monday and sunday methods | Vijay Dev | 2011-11-26 | 1 | -0/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #3764 from arunagw/test_sunday_monday | Vijay Dev | 2011-11-26 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Tests added for monday and sunday | |||||
| * | | | | | | | | Tests added for monday and sunday | Arun Agrawal | 2011-11-26 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference commits : a8f2860d0e7db86c61bb70935006100b04667ab1 80ac4dc6d0632937ccf61b38bc15fc2f6e27b18b | |||||
* | | | | | | | | | documenting monday and sunday methods | Vijay Dev | 2011-11-26 | 1 | -0/+11 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Adds Time#sunday method | Vijay Dev | 2011-11-26 | 2 | -0/+7 | |
| | | | | | | | | ||||||
* | | | | | | | | Convert aliases monday and sunday to methods | Vijay Dev | 2011-11-26 | 3 | -6/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent change to beginning_of_week and end_of_week added an argument that can be used to specify the week's starting day as a symbol. Now these methods were aliased as monday and sunday respectively which as a consequence of the argument addition, made calls like obj.monday(:sunday) possible. This commit makes them methods on their own. | |||||
* | | | | | | | | s/end_on_week/end_of_week | Vijay Dev | 2011-11-26 | 1 | -2/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | minor doc changes | Vijay Dev | 2011-11-26 | 2 | -4/+4 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #3760 from arunagw/warning_removed_unused_var | José Valim | 2011-11-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Warning removed unused variable | |||||
| * | | | | | | Warning removed unused variable | Arun Agrawal | 2011-11-26 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-26 | 9 | -20/+24 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | rephrased ef38c3089e1269e2b315aff503e61c0b23c95f00 and | Vijay Dev | 2011-11-26 | 1 | -5/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | mentioned about OS X and windows usually having a JS runtime | |||||
| * | | | | | | use any? to check for size | Vijay Dev | 2011-11-26 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | what's -> that's | Uģis Ozols | 2011-11-25 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Remove unnecessary comment. | Uģis Ozols | 2011-11-25 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | comma | rpq | 2011-11-23 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Move JS runtime instructions to where the error would be encountered, remove ↵ | Michael Pearson | 2011-11-24 | 1 | -12/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | gem install. | |||||
| * | | | | | | Add step to getting_started to install JS Runtime. | Michael Pearson | 2011-11-24 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abstrakt on #rubyonrails found that the guide, when followed step by step, does fails at the 'rails server' command due to a lacking JS runtime. | |||||
| * | | | | | | - Avoid using .first since it will create an additional query. | Marc Chung | 2011-11-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | - Handle scenario where @posts is empty. | |||||
| * | | | | | | Revert "Added links to the 'Rails Initialization Guide', marked as a work in ↵ | Vijay Dev | 2011-11-22 | 2 | -5/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | progress" This reverts commit 6b4939c3fd22924ee3d906f08fe739d848f80a3d. Reason: This guide is still incomplete and is not yet reviewed or ready to go to the index. | |||||
| * | | | | | | Fix missing single quote that was messing up syntax highlighting. | Robert Ross | 2011-11-21 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Minor grammar, typo & readability fixes for beginning of Rails ↵ | James Dean Shepherd | 2011-11-20 | 1 | -11/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialization guide | |||||
| * | | | | | | Added links to the 'Rails Initialization Guide', marked as a work in progress | James Dean Shepherd | 2011-11-20 | 2 | -0/+5 | |
| | | | | | | | ||||||
| * | | | | | | Small docs fix in Active Model callbacks module | Alexey Vakhov | 2011-11-19 | 1 | -1/+1 | |
| | | | | | | |