Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Revert "Remove blank trailing comments" | Vijay Dev | 2012-05-23 | 105 | -0/+192 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a. Reason: Not a fan of such massive changes. We usually close such changes if made to Rails master as a pull request. Following the same principle here and reverting. [ci skip] | |||||
| * | | | | | | | copy edit[ci skip] | Vijay Dev | 2012-05-23 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | [Guides] Fix sample code | Oscar Del Ben | 2012-05-23 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | [Guides] Rewrite server start section | Oscar Del Ben | 2012-05-23 | 1 | -8/+23 | |
| | | | | | | | | ||||||
| * | | | | | | | [Guides] Rewrite server start section | Oscar Del Ben | 2012-05-23 | 1 | -2/+20 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix incorrect example for fields_for - without the '=' it will not output ↵ | David Morton | 2012-05-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anything. | |||||
| * | | | | | | | clarified how file naming affects load order of initializers | Rory O’Kane | 2012-05-22 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | add CollectionProxy#length documentation | Francesco Rodriguez | 2012-05-22 | 1 | -5/+37 | |
| | | | | | | | | ||||||
| * | | | | | | | add CollectionProxy#size documentation | Francesco Rodriguez | 2012-05-22 | 1 | -2/+25 | |
| | | | | | | | | ||||||
| * | | | | | | | add :call-seq: to +first+ and +last+ CollectionProxy methods | Francesco Rodriguez | 2012-05-22 | 1 | -0/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | add CollectionProxy#create! documentation | Francesco Rodriguez | 2012-05-22 | 1 | -0/+22 | |
| | | | | | | | | ||||||
| * | | | | | | | add CollectionProxy#create documentation | Francesco Rodriguez | 2012-05-22 | 1 | -0/+33 | |
| | | | | | | | | ||||||
| * | | | | | | | add more examples to CollectionProxy#find | Francesco Rodriguez | 2012-05-22 | 1 | -0/+9 | |
| | | | | | | | | ||||||
| * | | | | | | | adding :call-seq: to CollectionProxy methods | Francesco Rodriguez | 2012-05-22 | 1 | -0/+39 | |
| | | | | | | | | ||||||
| * | | | | | | | add CollectionProxy#build documentation | Francesco Rodriguez | 2012-05-22 | 1 | -0/+31 | |
| | | | | | | | | ||||||
| * | | | | | | | [Guides] Update rails commands section | Oscar Del Ben | 2012-05-22 | 1 | -0/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | [Guides] Change bundler section | Oscar Del Ben | 2012-05-22 | 1 | -12/+12 | |
| | | | | | | | | ||||||
| * | | | | | | | [Guides] Review bin/rails section | Oscar Del Ben | 2012-05-22 | 1 | -2/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | [Guides] change rails bin section | Oscar Del Ben | 2012-05-22 | 1 | -6/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | The initialization guide will cover Rails 4 | Oscar Del Ben | 2012-05-22 | 1 | -2/+4 | |
| | | | | | | | | ||||||
| * | | | | | | | remove repeated documentation in CollectionProxy#clear | Francesco Rodriguez | 2012-05-22 | 1 | -24/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Remove Obsolute root specifiying short syntax | Gaurish Sharma | 2012-05-22 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This syntax does not seem to work. Throws the error "can't convert String into Hash (TypeError)" Tested on: * Ruby 1.9.3 * Rails 3.2.3 | |||||
| * | | | | | | | Remove obsolete comment from generator gem method | Alexey Vakhov | 2012-05-22 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comment about :env option for gem method was actual for rails 2.3 without bundler. Now bundler uses grups for this goal. | |||||
| * | | | | | | | Fix broken link | Gaurish Sharma | 2012-05-22 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | update CollectionProxy#clear documentation | Francesco Rodriguez | 2012-05-21 | 1 | -3/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | update CollectionProxy#delete_all documentation | Francesco Rodriguez | 2012-05-21 | 1 | -2/+29 | |
| | | | | | | | | ||||||
| * | | | | | | | add CollectionProxy#delete_all documentation | Francesco Rodriguez | 2012-05-21 | 1 | -0/+65 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix AR preloader example | Alexey Vakhov | 2012-05-22 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | fix CollectionProxy documentation markup | Francesco Rodriguez | 2012-05-21 | 1 | -8/+8 | |
| | | | | | | | | ||||||
| * | | | | | | | add CollectionProxy#reload documentation | Francesco Rodriguez | 2012-05-21 | 1 | -0/+18 | |
| | | | | | | | | ||||||
| * | | | | | | | improve CollectionProxy#destroy documentation | Francesco Rodriguez | 2012-05-21 | 1 | -5/+37 | |
| | | | | | | | | ||||||
| * | | | | | | | add CollectionProxy#destroy documentation | Francesco Rodriguez | 2012-05-21 | 1 | -1/+42 | |
| | | | | | | | | ||||||
| * | | | | | | | update CollectionProxy#destroy_all documentation | Francesco Rodriguez | 2012-05-20 | 1 | -1/+9 | |
| | | | | | | | | ||||||
| * | | | | | | | Remove blank trailing comments | Henrik Hodne | 2012-05-20 | 105 | -192/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace with the first match, and voilà! Note that the regex matches a little bit too much, so you probably want to `git add -i .` and go through every single diff to check if it actually should be changed. | |||||
| * | | | | | | | Update documentation for AbstractController::Base | Henrik Hodne | 2012-05-20 | 1 | -3/+11 | |
| | | | | | | | | ||||||
| * | | | | | | | add CollectionProxy#select documentation | Francesco Rodriguez | 2012-05-19 | 1 | -2/+55 | |
| | | | | | | | | ||||||
| * | | | | | | | add CollectionProxy#find documentation | Francesco Rodriguez | 2012-05-19 | 1 | -0/+20 | |
| | | | | | | | | ||||||
| * | | | | | | | Revert typo | Oscar Del Ben | 2012-05-19 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Typo | Oscar Del Ben | 2012-05-19 | 1 | -4/+4 | |
| | | | | | | | | ||||||
| * | | | | | | | Getting started guide has been completely rewritten and edited. | Oscar Del Ben | 2012-05-19 | 1 | -2/+0 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #6383 from oscardelben/add_oscardelben_to_authors | Vijay Dev | 2012-05-23 | 2 | -0/+4 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add oscardelben to authors | |||||
| * | | | | | | | | Add oscardelben to authors | Oscar Del Ben | 2012-05-18 | 2 | -0/+4 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #6194 from ayrton/optimized_images | Vijay Dev | 2012-05-23 | 72 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Optimizing all images used in the guides | |||||
| * | | | | | | | | | Compressed all images from the guide through ImageOptim which saves ↵ | Ayrton De Craene | 2012-05-07 | 72 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes up to 74.6% in size [ci skip] | |||||
* | | | | | | | | | | Merge pull request #6462 from grosser/feature/licenses | José Valim | 2012-05-23 | 7 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Add license field to gemspecs, by Matt Griffin | |||||
| * | | | | | | | | | | Add license field to gemspecs, by Matt Griffin | Matt Griffin | 2012-05-23 | 7 | -0/+7 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #6463 from jrochkind/connection_pool_timeout_keys | Aaron Patterson | 2012-05-23 | 4 | -12/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | ConnectionPool wait_timeout no longer used for different types of timeouts. #6441 | |||||
| * | | | | | | | | | | ConnectionPool wait_timeout no longer used for different types of timeouts. ↵ | Jonathan Rochkind | 2012-05-23 | 4 | -12/+21 | |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #6441 An AR ConnectionSpec `wait_timeout` is pre-patch used for three different things: * mysql2 uses it for MySQL's own wait_timeout (how long MySQL should allow an idle connection before closing it), and defaults to 2592000 seconds. * ConnectionPool uses it for "number of seconds to block and wait for a connection before giving up and raising a timeout error", default 5 seconds. * ConnectionPool uses it for the Reaper, for deciding if a 'dead' connection can be reaped. Default 5 seconds. Previously, if you want to change these from defaults, you need to change them all together. This is problematic _especially_ for the mysql2/ConnectionPool conflict, you will generally _not_ want them to be the same, as evidenced by their wildly different defaults. This has caused real problems for people #6441 #2894 But as long as we're changing this, forcing renaming the ConnectionPool key to be more specific, it made sense to seperate the two ConnectionPool uses too -- these two types of ConnectionPool timeouts ought to be able to be changed independently, you won't neccesarily want them to be the same, even though the defaults are (currently) the same. | |||||
* | | | | | | | | | | Merge pull request #6060 from lucashungaro/master | Carlos Antonio da Silva | 2012-05-23 | 5 | -1/+159 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Adding deep versions of stringify_keys and symbolize_keys (plain and bang) for nested hashes | |||||
| * | | | | | | | | | Adding deep versions of stringify_keys and symbolize_keys (plain and bang) ↵ | Lucas Húngaro | 2012-05-23 | 5 | -1/+159 | |
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | for nested hashes |