aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7726 from jcorcuera/masterSantiago Pastorino2012-09-213-3/+3
|\
| * Remove .rb from require sentencesJosé Corcuera Z2012-09-213-3/+3
* | Use debugger gem if we are not Travis and Ruby < 2.0Santiago Pastorino2012-09-211-1/+1
* | Add debugger to mri:test section of the GemfileSantiago Pastorino2012-09-211-0/+1
* | start could be a stringSantiago Pastorino2012-09-212-3/+3
* | Revert "Fix find_in_batches with customized primary_key"Santiago Pastorino2012-09-214-28/+11
* | Raise the same exception the code is handlingSantiago Pastorino2012-09-211-1/+1
|/
* Revert "update ActionMailer::Base documentation [ci skip]"Rafael Mendonça França2012-09-211-258/+216
* Style: remove hash noiseJeremy Kemper2012-09-211-10/+10
* Correct default charset/collation for mysql dbsJeremy Kemper2012-09-212-15/+30
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-223-67/+67
|\
| * Update action_mailer_basics.md to ruby 1.9 syntax. [ci skip]José Corcuera2012-09-211-61/+61
| * Update examples in action_controller_overview.md to ruby 1.9 syntax. [ci skip]José Corcuera2012-09-211-4/+4
| * Update examples in AS::Concern to use correct scope syntax. [ci skip]José Corcuera2012-09-211-2/+2
* | Use default charset/collation only if *neither* is specified. Otherwise we se...Jeremy Kemper2012-09-211-4/+7
* | some edits in 4.0 release notes [ci skip]Vijay Dev2012-09-221-9/+10
* | Fix typos and links in engines guide [ci skip]Vijay Dev2012-09-211-3/+2
* | fix some md syntax errors and general revisions [ci skip]Vijay Dev2012-09-213-20/+19
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-2195-1174/+1339
|\
| * remove nodoc [ci skip]Vijay Dev2012-09-211-1/+1
| * Updated description of what engines are used forStephan Hagemann2012-09-211-2/+2
| * Revert "Fix MIME type in CHANGELOG"Jo Liss2012-09-211-1/+1
| * Fix MIME type in CHANGELOGJo Liss2012-09-211-1/+1
| * Add extra note about :dependent => :destroy.Steve Klabnik2012-09-211-1/+4
| * correct a typoPrzemek Hocke2012-09-211-1/+1
| * Add missing "m" charPrzemek Hocke2012-09-211-1/+1
| * fix two typos in the associations guidePrzemek Hocke2012-09-211-2/+2
| * fix a small typoPrzemek Hocke2012-09-211-1/+1
| * Fix indentation and update documentation for Array#wrap for Ruby 1.9Jo Liss2012-09-201-9/+10
| * fix :nodoc:s in AR::Timestamp [ci skip]Francesco Rodriguez2012-09-191-7/+7
| * fix Hash#slice code example [ci skip]Francesco Rodriguez2012-09-182-2/+2
| * Update 3.0 -> 3.1 session information.Steve Klabnik2012-09-181-0/+13
| * Expanded note about poly associations.Steve Klabnik2012-09-181-3/+12
| * update ActionMailer documentation [ci skip]Francesco Rodriguez2012-09-175-18/+15
| * Add note about inheretance and poly associations.Steve Klabnik2012-09-171-0/+4
| * update ActionMailer::Base documentation [ci skip]Francesco Rodriguez2012-09-171-266/+323
| * update code examples to 1.9 hash syntax in the AR/README [ci skip]Francesco Rodriguez2012-09-171-12/+12
| * update AS docs [ci skip]Francesco Rodriguez2012-09-1723-329/+378
| * fix AS::OrderedOptions documentation [ci skip]Francesco Rodriguez2012-09-171-16/+15
| * Update "Getting Started" guideSimon Hengel2012-09-161-1/+1
| * Doc typo: depenent -> dependent; trailing ws.Henrik N2012-09-161-2/+2
| * Improve documentation about :dependent and callbacks.Steve Klabnik2012-09-151-0/+5
| * update AS/values and AS/xml_mini docs [ci skip]Francesco Rodriguez2012-09-144-39/+54
| * update AS/notifications and AS/testing docs [ci skip]Francesco Rodriguez2012-09-143-8/+10
| * update AS/log_subscriber and AS/multibyte docs [ci skip]Francesco Rodriguez2012-09-143-55/+76
| * update AS/json docs [ci skip]Francesco Rodriguez2012-09-142-12/+20
| * update AS/inflector docs [ci skip]Francesco Rodriguez2012-09-143-142/+167
| * update AS/deprecation docs [ci skip]Francesco Rodriguez2012-09-142-9/+9
| * add :nodoc: to AS::Autoload#extended [ci skip]Francesco Rodriguez2012-09-141-2/+1
| * Remove redundant 'the'.Uģis Ozols2012-09-131-1/+1