aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Revert "Remove blank trailing comments"Vijay Dev2012-05-23105-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 Dev2012-05-231-1/+1
| | | | | | | |
| * | | | | | | [Guides] Fix sample codeOscar Del Ben2012-05-231-1/+1
| | | | | | | |
| * | | | | | | [Guides] Rewrite server start sectionOscar Del Ben2012-05-231-8/+23
| | | | | | | |
| * | | | | | | [Guides] Rewrite server start sectionOscar Del Ben2012-05-231-2/+20
| | | | | | | |
| * | | | | | | Fix incorrect example for fields_for - without the '=' it will not output ↵David Morton2012-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anything.
| * | | | | | | clarified how file naming affects load order of initializersRory O’Kane2012-05-221-1/+1
| | | | | | | |
| * | | | | | | add CollectionProxy#length documentationFrancesco Rodriguez2012-05-221-5/+37
| | | | | | | |
| * | | | | | | add CollectionProxy#size documentationFrancesco Rodriguez2012-05-221-2/+25
| | | | | | | |
| * | | | | | | add :call-seq: to +first+ and +last+ CollectionProxy methodsFrancesco Rodriguez2012-05-221-0/+6
| | | | | | | |
| * | | | | | | add CollectionProxy#create! documentationFrancesco Rodriguez2012-05-221-0/+22
| | | | | | | |
| * | | | | | | add CollectionProxy#create documentationFrancesco Rodriguez2012-05-221-0/+33
| | | | | | | |
| * | | | | | | add more examples to CollectionProxy#findFrancesco Rodriguez2012-05-221-0/+9
| | | | | | | |
| * | | | | | | adding :call-seq: to CollectionProxy methodsFrancesco Rodriguez2012-05-221-0/+39
| | | | | | | |
| * | | | | | | add CollectionProxy#build documentationFrancesco Rodriguez2012-05-221-0/+31
| | | | | | | |
| * | | | | | | [Guides] Update rails commands sectionOscar Del Ben2012-05-221-0/+5
| | | | | | | |
| * | | | | | | [Guides] Change bundler sectionOscar Del Ben2012-05-221-12/+12
| | | | | | | |
| * | | | | | | [Guides] Review bin/rails sectionOscar Del Ben2012-05-221-2/+5
| | | | | | | |
| * | | | | | | [Guides] change rails bin sectionOscar Del Ben2012-05-221-6/+5
| | | | | | | |
| * | | | | | | The initialization guide will cover Rails 4Oscar Del Ben2012-05-221-2/+4
| | | | | | | |
| * | | | | | | remove repeated documentation in CollectionProxy#clearFrancesco Rodriguez2012-05-221-24/+2
| | | | | | | |
| * | | | | | | Remove Obsolute root specifiying short syntaxGaurish Sharma2012-05-221-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 methodAlexey Vakhov2012-05-221-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 linkGaurish Sharma2012-05-221-1/+1
| | | | | | | |
| * | | | | | | update CollectionProxy#clear documentationFrancesco Rodriguez2012-05-211-3/+2
| | | | | | | |
| * | | | | | | update CollectionProxy#delete_all documentationFrancesco Rodriguez2012-05-211-2/+29
| | | | | | | |
| * | | | | | | add CollectionProxy#delete_all documentationFrancesco Rodriguez2012-05-211-0/+65
| | | | | | | |
| * | | | | | | Fix AR preloader exampleAlexey Vakhov2012-05-221-1/+1
| | | | | | | |
| * | | | | | | fix CollectionProxy documentation markupFrancesco Rodriguez2012-05-211-8/+8
| | | | | | | |
| * | | | | | | add CollectionProxy#reload documentationFrancesco Rodriguez2012-05-211-0/+18
| | | | | | | |
| * | | | | | | improve CollectionProxy#destroy documentationFrancesco Rodriguez2012-05-211-5/+37
| | | | | | | |
| * | | | | | | add CollectionProxy#destroy documentationFrancesco Rodriguez2012-05-211-1/+42
| | | | | | | |
| * | | | | | | update CollectionProxy#destroy_all documentationFrancesco Rodriguez2012-05-201-1/+9
| | | | | | | |
| * | | | | | | Remove blank trailing commentsHenrik Hodne2012-05-20105-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::BaseHenrik Hodne2012-05-201-3/+11
| | | | | | | |
| * | | | | | | add CollectionProxy#select documentationFrancesco Rodriguez2012-05-191-2/+55
| | | | | | | |
| * | | | | | | add CollectionProxy#find documentationFrancesco Rodriguez2012-05-191-0/+20
| | | | | | | |
| * | | | | | | Revert typoOscar Del Ben2012-05-191-1/+1
| | | | | | | |
| * | | | | | | TypoOscar Del Ben2012-05-191-4/+4
| | | | | | | |
| * | | | | | | Getting started guide has been completely rewritten and edited.Oscar Del Ben2012-05-191-2/+0
| | | | | | | |
* | | | | | | | Merge pull request #6383 from oscardelben/add_oscardelben_to_authorsVijay Dev2012-05-232-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add oscardelben to authors
| * | | | | | | | Add oscardelben to authorsOscar Del Ben2012-05-182-0/+4
| | | | | | | | |
* | | | | | | | | Merge pull request #6194 from ayrton/optimized_imagesVijay Dev2012-05-2372-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Optimizing all images used in the guides
| * | | | | | | | | Compressed all images from the guide through ImageOptim which saves ↵Ayrton De Craene2012-05-0772-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes up to 74.6% in size [ci skip]
* | | | | | | | | | Merge pull request #6462 from grosser/feature/licensesJosé Valim2012-05-237-0/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add license field to gemspecs, by Matt Griffin
| * | | | | | | | | | Add license field to gemspecs, by Matt GriffinMatt Griffin2012-05-237-0/+7
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #6463 from jrochkind/connection_pool_timeout_keysAaron Patterson2012-05-234-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 Rochkind2012-05-234-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/masterCarlos Antonio da Silva2012-05-235-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úngaro2012-05-235-1/+159
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | for nested hashes